record window size in config

feeluown/config.py

@@ -10,10 +10,18 @@
 
 
 class Config(MutableMapping):
+    """load default config and user config
+
+    user config can override default config
+    """
     def __init__(self):
         self._data = dict()
 
     def load(self, path=CONFIG_FILE_PATH):
+        # load default config first, there may be some new key field which not
+        # exists in user config
+        with open(DEFAULT_CONFIG_FILE_PATH, 'r') as f:
+            self._data.update(yaml.load(f))
         try:
             with open(path, 'r') as f:
                 self._data.update(yaml.load(f))
@@ -30,8 +38,8 @@ def save(self, path=CONFIG_FILE_PATH):
     def __getitem__(self, key):
         return self._data[self.__keytransform__(key)]
 
-    def __setitem__(self, key):
-        return self._data[self.__keytransform__(key)]
+    def __setitem__(self, key, value):
+        self._data[self.__keytransform__(key)] = value
 
     def __keytransform__(self, key):
         return key

feeluown/controller_api.py

@@ -75,7 +75,7 @@ def toggle_desktop_mini(cls):
         else:
             ControllerApi.desktop_mini.show()
             ControllerApi.notify_widget.show_message(
-                    "Tips", "按ESC可以退出mini模式哦 ~")
+                "Tips", "按ESC可以退出mini模式哦 ~")
 
     @classmethod
     @pyqtSlot(int)

feeluown/default_config.yaml

@@ -19,4 +19,7 @@ lyric:
 songs:
     dirs: [~/Music]
     download: ~/Music
+
+width: 960
+height: 600
 ...

feeluown/glue.py

@@ -74,7 +74,6 @@ def __init__(self, parent=None):
         self.setAttribute(Qt.WA_MacShowFocusRect, False)
         self.setWindowIcon(QIcon(WINDOW_ICON))
         self.setWindowTitle('FeelUOwn')
-        self.resize(1000, 608)
 
         self.mode_manager = ModesManger()
         self._init_signal_binding()
@@ -103,18 +102,18 @@ def _init_signal_binding(self):
         ViewOp.ui.QUIT_ACTION.triggered.connect(sys.exit)
         ViewOp.ui.SONG_PROGRESS_SLIDER.sliderMoved.connect(ControllerApi.seek)
         ViewOp.ui.SHOW_CURRENT_SONGS.clicked.connect(
-                self._show_current_playlist)
+            self._show_current_playlist)
 
         ViewOp.ui.SEARCH_BOX.returnPressed.connect(self._search_music)
         ViewOp.ui.LOVE_SONG_BTN.clicked.connect(
-                ViewOp.on_set_favorite_btn_clicked)
+            ViewOp.on_set_favorite_btn_clicked)
         ViewOp.ui.SIMI_SONGS_BTN.clicked.connect(
-                self.mode_manager.change_to_simi)
+            self.mode_manager.change_to_simi)
 
         ViewOp.ui.SHOW_DESKTOP_MINI.clicked.connect(self.switch_desktop_mini)
 
         ViewOp.ui.PLAY_OR_PAUSE.clicked.connect(
-                ViewOp.on_play_or_pause_clicked)
+            ViewOp.on_play_or_pause_clicked)
 
         ViewOp.ui.WEBVIEW.signal_play.connect(self.on_play_song_clicked)
         ViewOp.ui.WEBVIEW.signal_play_songs.connect(self.on_play_songs)
@@ -123,13 +122,13 @@ def _init_signal_binding(self):
         ViewOp.ui.WEBVIEW.signal_search_artist.connect(self.search_artist)
 
         ViewOp.ui.PLAY_PREVIOUS_SONG_BTN.clicked.connect(
-                ControllerApi.player.play_last)
+            ControllerApi.player.play_last)
         ViewOp.ui.PLAY_NEXT_SONG_BTN.clicked.connect(
-                ControllerApi.player.play_next)
+            ControllerApi.player.play_next)
         ViewOp.ui.PLAY_MV_BTN.clicked.connect(
-                ViewOp.on_play_current_song_mv_clicked)
+            ViewOp.on_play_current_song_mv_clicked)
         ViewOp.ui.SHOW_LYRIC_BTN.clicked.connect(
-                ControllerApi.toggle_lyric_widget)
+            ControllerApi.toggle_lyric_widget)
 
         ViewOp.ui.SPREAD_BTN_FOR_MY_LIST.clicked.connect(
             ViewOp.ui.MY_LIST_WIDGET.fold_spread_with_animation)
@@ -140,38 +139,38 @@ def _init_signal_binding(self):
         ViewOp.ui.NEW_PLAYLIST_BTN.clicked.connect(ViewOp.new_playlist)
 
         ControllerApi.player.signal_player_media_changed.connect(
-                ViewOp.on_player_media_changed)
+            ViewOp.on_player_media_changed)
         ControllerApi.player.stateChanged.connect(
-                ViewOp.on_player_state_changed)
+            ViewOp.on_player_state_changed)
         ControllerApi.player.positionChanged.connect(
-                ViewOp.on_player_position_changed)
+            ViewOp.on_player_position_changed)
         ControllerApi.player.durationChanged.connect(
-                ViewOp.on_player_duration_changed)
+            ViewOp.on_player_duration_changed)
         ControllerApi.player.signal_playlist_is_empty.connect(
-                self.on_playlist_empty)
+            self.on_playlist_empty)
         ControllerApi.player.signal_playback_mode_changed.connect(
             ViewOp.ui.STATUS_BAR.playmode_switch_label.on_mode_changed)
         ControllerApi.player.signal_playback_mode_changed.connect(
             feeluown.config.on_playback_mode_change)
 
         ControllerApi.network_manager.finished.connect(
-                ControllerApi.network_manager.access_network_queue)
+            ControllerApi.network_manager.access_network_queue)
 
         ControllerApi.desktop_mini.content.set_song_like_signal.connect(
-                ViewOp.on_set_favorite_btn_clicked)
+            ViewOp.on_set_favorite_btn_clicked)
         ControllerApi.desktop_mini.content.play_last_music_signal.connect(
-                ControllerApi.player.play_last)
+            ControllerApi.player.play_last)
         ControllerApi.desktop_mini.content.play_next_music_signal.connect(
-                ControllerApi.player.play_next)
+            ControllerApi.player.play_next)
         ControllerApi.desktop_mini.close_signal.connect(self.show)
 
         ViewOp.ui.FM_ITEM.signal_text_btn_clicked.connect(
-                self.mode_manager.change_to_fm)
+            self.mode_manager.change_to_fm)
         ViewOp.ui.RECOMMEND_ITEM.signal_text_btn_clicked.connect(
-                ViewOp.on_recommend_item_clicked)
+            ViewOp.on_recommend_item_clicked)
 
         ControllerApi.current_playlist_widget.signal_play_music.connect(
-                self.on_play_song_clicked)
+            self.on_play_song_clicked)
         ControllerApi.current_playlist_widget.signal_remove_music_from_list.\
             connect(self.remove_music_from_list)
 
@@ -180,7 +179,7 @@ def _init_signal_binding(self):
         ViewOp.ui.PROGRESS.setRange(0, 100)
 
         ControllerApi.player.signal_download_progress.connect(
-                ViewOp.ui.PROGRESS.setValue)
+            ViewOp.ui.PROGRESS.setValue)
 
         self._search_shortcut.activated.connect(ViewOp.ui.SEARCH_BOX.setFocus)
         self._pre_focus.activated.connect(FocusManager.change_focus)
@@ -209,7 +208,9 @@ def _show_current_playlist(self):
     def load_config(self):
         LOG.info('load user config')
         ControllerApi.player.set_play_mode(
-                feeluown.config['player']['playback_mode'])
+            feeluown.config['player']['playback_mode'])
+        self.resize(feeluown.config['width'],
+                    feeluown.config['height'])
 
     @pyqtSlot()
     def pop_login(self):
@@ -307,5 +308,9 @@ def paintEvent(self, event):
         style = self.style()
         style.drawPrimitive(QStyle.PE_Widget, option, painter, self)
 
+    def resizeEvent(self, event):
+        feeluown.config.update({'width': self.width(),
+                                'height': self.height()})
+
     def closeEvent(self, event):
         ControllerApi.ready_to_quit()