Skip to content

Commit

Permalink
Add status bar in the browser window.
Browse files Browse the repository at this point in the history
  • Loading branch information
tsufeki committed Mar 8, 2015
1 parent 360b8c6 commit 8be04a9
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 67 deletions.
10 changes: 10 additions & 0 deletions qygmy/browser.py
Expand Up @@ -17,17 +17,23 @@ def setup_ui(self):
self.ui = Ui_browser()
self.ui.setupUi(self)
self.setup_icons()
self.ui.statusbar.addWidget(self.ui.status, 1)
self.ui.database.setup(self.srv.database)
self.srv.database.current.changed.connect(self.ui.dbpath.set_path)
self.srv.database.current.changed.connect(self.update_status)
self.ui.dbpath.clicked.connect(self.srv.database.cd)
self.ui.playlists.setup(self.srv.playlists)
self.srv.playlists.current.changed.connect(self.ui.plpath.set_path)
self.srv.playlists.current.changed.connect(self.update_status)
self.ui.plpath.clicked.connect(self.srv.playlists.cd)
self.ui.search_results.setup(self.srv.search)
self.srv.search.current.changed.connect(self.update_status)
self.ui.search_button.setDefaultAction(self.ui.search)
self.ui.what.setModel(self.srv.search.search_tags)
self.ui.what.model().modelReset.connect(lambda: self.ui.what.setCurrentIndex(0))
self.srv.state.changed.connect(self.on_state_changed)
self.srv.state.changed.connect(self.update_status)
self.ui.tabs.currentChanged.connect(self.update_status)
self.ui.updatedb.triggered.connect(self.srv.updatedb)
self.ui.close.triggered.connect(self.close)

Expand Down Expand Up @@ -63,6 +69,10 @@ def current_view(self):
elif i == 1: return self.ui.playlists
elif i == 2: return self.ui.search_results

def update_status(self, *_):
self.ui.status.setText(self.main.fmt.browser_status(self.srv.state.value,
self.current_view.model().total_length, len(self.current_view.model())))

def closeEvent(self, e):
self.main.settings['guistate']['browser_geometry'] = str(self.saveGeometry().toBase64())
self.main.settings['guistate']['browser_tab'] = str(self.ui.tabs.currentIndex())
Expand Down
13 changes: 12 additions & 1 deletion qygmy/formatter.py
Expand Up @@ -39,6 +39,12 @@ def retranslate(self):
'$if($gt(%totallength%,0),'
'\\, $time(%totallength%) total,))'
),
'browser_status': self.tr(
'$if(%disconnected%,,'
'%totalcount% items'
'$if($gt(%totallength%,0),'
'\\, $time(%totallength%) total,))'
),
'statistics': (
(self.tr('MPD version:'), self.tr('%mpdversion%')),
(self.tr('Songs:'), self.tr('%songs%')),
Expand All @@ -62,7 +68,7 @@ def retranslate(self):
(self.tr('Last modified:'), self.tr('%lastmodified%')),
(self.tr('Composer:'), self.tr('%composer%')),
(self.tr('Performer:'), self.tr('%performer%')),
)
),
}

standard_tags = {'file', 'directory', 'playlist', 'filename', 'name', 'title',
Expand Down Expand Up @@ -221,6 +227,11 @@ def status(self, state, totallength, totalcount):
context.update(self._prepare_state(state))
return self.render('status', context)

def browser_status(self, state, totallength, totalcount):
context = {'totallength': str(totallength), 'totalcount': str(totalcount)}
context.update(self._prepare_state(state))
return self.render('browser_status', context)

def info_dialog(self, name, info):
unrecognized = []
if name == 'details':
Expand Down

0 comments on commit 8be04a9

Please sign in to comment.