diff --git a/qt/mainwin.cc b/qt/mainwin.cc index 8719a4e1a..34114795a 100644 --- a/qt/mainwin.cc +++ b/qt/mainwin.cc @@ -136,7 +136,7 @@ TrMainWindow :: TrMainWindow( Session& session, Prefs& prefs, TorrentModel& mode connect( ui.action_TrayIcon, SIGNAL(toggled(bool)), this, SLOT(setTrayIconVisible(bool))); connect( ui.action_Filterbar, SIGNAL(toggled(bool)), this, SLOT(setFilterbarVisible(bool))); connect( ui.action_Statusbar, SIGNAL(toggled(bool)), this, SLOT(setStatusbarVisible(bool))); - connect( ui.action_MinimalView, SIGNAL(toggled(bool)), this, SLOT(setMinimalView(bool))); + connect( ui.action_CompactView, SIGNAL(toggled(bool)), this, SLOT(setCompactView(bool))); connect( ui.action_SortByActivity, SIGNAL(toggled(bool)), this, SLOT(onSortByActivityToggled(bool))); connect( ui.action_SortByAge, SIGNAL(toggled(bool)), this, SLOT(onSortByAgeToggled(bool))); connect( ui.action_SortByETA, SIGNAL(toggled(bool)), this, SLOT(onSortByETAToggled(bool))); @@ -259,7 +259,7 @@ TrMainWindow :: TrMainWindow( Session& session, Prefs& prefs, TorrentModel& mode << Prefs :: STATUSBAR_STATS << Prefs :: TOOLBAR << Prefs :: ALT_SPEED_LIMIT_ENABLED - << Prefs :: MINIMAL_VIEW + << Prefs :: COMPACT_VIEW << Prefs :: DSPEED << Prefs :: DSPEED_ENABLED << Prefs :: USPEED @@ -886,9 +886,9 @@ void TrMainWindow :: showSessionTransfer ( ) { myPrefs.set( Prefs::STATUSBAR_STA **/ void -TrMainWindow :: setMinimalView( bool visible ) +TrMainWindow :: setCompactView( bool visible ) { - myPrefs.set( Prefs :: MINIMAL_VIEW, visible ); + myPrefs.set( Prefs :: COMPACT_VIEW, visible ); } void TrMainWindow :: setTrayIconVisible( bool visible ) @@ -1038,9 +1038,9 @@ TrMainWindow :: refreshPref( int key ) myTrayIcon.setVisible( b ); break; - case Prefs::MINIMAL_VIEW: + case Prefs::COMPACT_VIEW: b = myPrefs.getBool( key ); - ui.action_MinimalView->setChecked( b ); + ui.action_CompactView->setChecked( b ); ui.listView->setItemDelegate( b ? myTorrentDelegateMin : myTorrentDelegate ); ui.listView->reset( ); // force the rows to resize break; diff --git a/qt/mainwin.h b/qt/mainwin.h index 854ddae4b..1d0bfcad2 100644 --- a/qt/mainwin.h +++ b/qt/mainwin.h @@ -184,7 +184,7 @@ class TrMainWindow: public QMainWindow void setFilterbarVisible( bool ); void setStatusbarVisible( bool ); void setTrayIconVisible( bool ); - void setMinimalView( bool ); + void setCompactView( bool ); void refreshActionSensitivity( ); void wrongAuthentication( ); diff --git a/qt/mainwin.ui b/qt/mainwin.ui index 23092e782..5c7a14009 100644 --- a/qt/mainwin.ui +++ b/qt/mainwin.ui @@ -51,7 +51,7 @@ 0 0 792 - 25 + 23 @@ -103,7 +103,7 @@ &View - + @@ -319,12 +319,18 @@ &Preferences - + true - &Minimal View + &Compact View + + + Compact View + + + Compact View Alt+M diff --git a/qt/prefs.cc b/qt/prefs.cc index c98829f75..235bd751c 100644 --- a/qt/prefs.cc +++ b/qt/prefs.cc @@ -43,7 +43,7 @@ Prefs::PrefItem Prefs::myItems[] = { ASKQUIT, "prompt-before-exit", QVariant::Bool }, { SORT_MODE, "sort-mode", TrTypes::SortModeType }, { SORT_REVERSED, "sort-reversed", QVariant::Bool }, - { MINIMAL_VIEW, "minimal-view", QVariant::Bool }, + { COMPACT_VIEW, "compact-view", QVariant::Bool }, { FILTERBAR, "show-filterbar", QVariant::Bool }, { STATUSBAR, "show-statusbar", QVariant::Bool }, { STATUSBAR_STATS, "statusbar-stats", QVariant::String }, @@ -256,7 +256,7 @@ Prefs :: initDefaults( tr_benc * d ) tr_bencDictAddInt( d, keyStr(ASKQUIT), true ); tr_bencDictAddStr( d, keyStr(SORT_MODE), "sort-by-name" ); tr_bencDictAddInt( d, keyStr(SORT_REVERSED), false ); - tr_bencDictAddInt( d, keyStr(MINIMAL_VIEW), false ); + tr_bencDictAddInt( d, keyStr(COMPACT_VIEW), false ); tr_bencDictAddInt( d, keyStr(START), true ); tr_bencDictAddInt( d, keyStr(TRASH_ORIGINAL), false ); tr_bencDictAddStr( d, keyStr(SESSION_REMOTE_HOST), "localhost" ); diff --git a/qt/prefs.h b/qt/prefs.h index 34ec3f881..04efae084 100644 --- a/qt/prefs.h +++ b/qt/prefs.h @@ -46,7 +46,7 @@ class Prefs: public QObject ASKQUIT, SORT_MODE, SORT_REVERSED, - MINIMAL_VIEW, + COMPACT_VIEW, FILTERBAR, STATUSBAR, STATUSBAR_STATS,