diff --git a/kivyblocks/blocksapp.py b/kivyblocks/blocksapp.py index 40d6f84..6c416c8 100644 --- a/kivyblocks/blocksapp.py +++ b/kivyblocks/blocksapp.py @@ -10,6 +10,7 @@ from kivy.config import Config from kivy.metrics import sp,dp,mm from kivy.core.window import WindowBase, Window from kivy.clock import Clock +from kivy.logger import Logger import kivy from kivy.resources import resource_add_path @@ -19,11 +20,7 @@ Config.set('kivy', 'default_font', [ 'DroidSansFallback.ttf']) from kivy.app import App -# from .baseWidget import baseWidgets -# from .widgetExt import Messager -# from .externalwidgetmanager import ExternalWidgetManager from .threadcall import HttpClient,Workers -# from .derivedWidget import buildWidget, loadUserDefinedWidget from .utils import * from .pagescontainer import PageContainer from .widgetExt.messager import Messager @@ -64,12 +61,19 @@ def signal_handler(signal, frame): signal.signal(signal.SIGINT, signal_handler) -def on_close(o,v=None): +def on_close(*args,**kwargs): """ catch the "x" button's event of window """ + Logger.info('kivyblocks: on_close(), args=%s, kwargs=%s',str(args),str(kwargs)) app = App.get_running_app() - app.workers.running = False + if len(app.root.pageWidgets) <= 1: + app.workers.running = False + Logger.info('kivyblocks: on_close(), return False') + return False + app.root.previous() + Logger.info('kivyblocks: on_close(), return True') + return True def getAuthHeader(): app = App.get_running_app() diff --git a/kivyblocks/imgs/Cycle.jpg b/kivyblocks/imgs/Cycle.jpg deleted file mode 100644 index 40cc92c..0000000 Binary files a/kivyblocks/imgs/Cycle.jpg and /dev/null differ diff --git a/kivyblocks/imgs/Next64x64.png b/kivyblocks/imgs/Next64x64.png deleted file mode 100644 index c75014c..0000000 Binary files a/kivyblocks/imgs/Next64x64.png and /dev/null differ diff --git a/kivyblocks/imgs/musictrack.jpg b/kivyblocks/imgs/musictrack.jpg deleted file mode 100644 index 061c90a..0000000 Binary files a/kivyblocks/imgs/musictrack.jpg and /dev/null differ diff --git a/kivyblocks/imgs/mute.jpg b/kivyblocks/imgs/mute.jpg deleted file mode 100644 index 70da9c1..0000000 Binary files a/kivyblocks/imgs/mute.jpg and /dev/null differ diff --git a/kivyblocks/imgs/next.jpg b/kivyblocks/imgs/next.jpg deleted file mode 100644 index 23320aa..0000000 Binary files a/kivyblocks/imgs/next.jpg and /dev/null differ diff --git a/kivyblocks/imgs/pause.jpg b/kivyblocks/imgs/pause.jpg deleted file mode 100644 index d93c235..0000000 Binary files a/kivyblocks/imgs/pause.jpg and /dev/null differ diff --git a/kivyblocks/imgs/play.jpg b/kivyblocks/imgs/play.jpg deleted file mode 100644 index 63232fa..0000000 Binary files a/kivyblocks/imgs/play.jpg and /dev/null differ diff --git a/kivyblocks/imgs/replay.jpg b/kivyblocks/imgs/replay.jpg deleted file mode 100644 index a60a719..0000000 Binary files a/kivyblocks/imgs/replay.jpg and /dev/null differ diff --git a/kivyblocks/imgs/search.png b/kivyblocks/imgs/search.png index a72d11a..0ca66ef 100644 Binary files a/kivyblocks/imgs/search.png and b/kivyblocks/imgs/search.png differ diff --git a/kivyblocks/imgs/volume.jpg b/kivyblocks/imgs/volume.jpg deleted file mode 100644 index 355aa6e..0000000 Binary files a/kivyblocks/imgs/volume.jpg and /dev/null differ diff --git a/kivyblocks/vplayer.py b/kivyblocks/vplayer.py index 872a386..84549f2 100644 --- a/kivyblocks/vplayer.py +++ b/kivyblocks/vplayer.py @@ -334,29 +334,29 @@ class VPlayer(BaseVPlayer): def buildMenu(self): self.menubar = BoxLayout(orientation='horizontal', size_hint_y=None,height=CSize(1.4)) - self.btn_pause = PressableImage(source=blockImage('pause.jpg'), + self.btn_pause = PressableImage(source=blockImage('pause.png'), size_hint=(None,None), size=CSize(3,3) ) if self._video.state == 'pause': - self.btn_pause.source = blockImage('play.jpg') + self.btn_pause.source = blockImage('play.png') self.btn_pause.bind(on_press=self.pause) self.menubar.add_widget(self.btn_pause) """ - self.btn_mute = PressableImage(source=blockImage('mute.jpg'), + self.btn_mute = PressableImage(source=blockImage('mute.png'), size_hint=(None,None), size=CSize(3,3) ) self.btn_mute.bind(on_press=self.mute) self.menubar.add_widget(self.btn_mute) """ - btn_cut = PressableImage(source=blockImage('next.jpg'), + btn_cut = PressableImage(source=blockImage('next.png'), size_hint=(None,None), size=CSize(3,3) ) btn_cut.bind(on_press=self.endplay) self.menubar.add_widget(btn_cut) - btn_replay = PressableImage(source=blockImage('replay.jpg'), + btn_replay = PressableImage(source=blockImage('replay.png'), size_hint=(None,None), size=CSize(3,3) ) @@ -364,7 +364,7 @@ class VPlayer(BaseVPlayer): self.menubar.add_widget(btn_replay) self.btn_audioswitch = PressableImage( \ - source=blockImage('musictrack.jpg'), + source=blockImage('musictrack.png'), size_hint=(None,None), size=CSize(3,3) ) @@ -393,17 +393,17 @@ class VPlayer(BaseVPlayer): BaseVPlayer.mute(self,btn) if self.menubar: if self._video.volume < 0.001: - btn.source = blockImage('volume.jpg') + btn.source = blockImage('volume.png') else: - btn.source = blockImage('mute.jpg') + btn.source = blockImage('mute.png') def pause(self,t=None): BaseVPlayer.pause(self,t) if self.menubar: if self._video.state == 'pause': - self.btn_pause.source = blockImage('play.jpg') + self.btn_pause.source = blockImage('play.png') else: - self.btn_pause.source = blockImage('pause.jpg') + self.btn_pause.source = blockImage('pause.png') def on_state(self,o,v): BaseVPlayer.on_state(self,o,v)