mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk, qt) rename the slightly-pejorative "minimal view" as "compact view"

This commit is contained in:
Charles Kerr 2010-03-15 14:42:56 +00:00
parent 41d090b735
commit ca4dce6f5e
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qt/mainwin.cc
View File

@ -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;

2
qt/mainwin.h
View File

@ -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( );

14
qt/mainwin.ui
View File

@ -51,7 +51,7 @@
<x>0</x>
<y>0</y>
<width>792</width>
<height>25</height>
<height>23</height>
</rect>
</property>
<property name="sizePolicy">
@ -103,7 +103,7 @@
<property name="title">
<string>&amp;View</string>
</property>
<addaction name="action_MinimalView"/>
<addaction name="action_CompactView"/>
<addaction name="separator"/>
<addaction name="action_Toolbar"/>
<addaction name="action_Filterbar"/>
@ -319,12 +319,18 @@
<string>&amp;Preferences</string>
</property>
</action>
<action name="action_MinimalView">
<action name="action_CompactView">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Minimal View</string>
<string>&amp;Compact View</string>
</property>
<property name="iconText">
<string>Compact View</string>
</property>
<property name="toolTip">
<string>Compact View</string>
</property>
<property name="shortcut">
<string>Alt+M</string>

4
qt/prefs.cc
View File

@ -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" );

2
qt/prefs.h
View File

@ -46,7 +46,7 @@ class Prefs: public QObject
ASKQUIT,
SORT_MODE,
SORT_REVERSED,
MINIMAL_VIEW,
COMPACT_VIEW,
FILTERBAR,
STATUSBAR,
STATUSBAR_STATS,