AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Separated View->File List checked menu option into two separate mutually exclusive options

Browse Source 
FossilOrigin-Name: 502ce5e1b68dd97da3b9a779e5683d2f1ddcb61c
This commit is contained in:
kostas 2015-05-17 11:19:18 +00:00
parent cee4c93efc
commit d63f963779
5 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@ -1,5 +1,5 @@
C Renamed\sDirModel\sto\sTreeModel
D 2015-05-17T10:13:46.499
C Separated\sView->File\sList\schecked\smenu\soption\sinto\stwo\sseparate\smutually\sexclusive\soptions
D 2015-05-17T11:19:18.730
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@ -200,8 +200,8 @@ F src/Fossil.cpp ca7ad24622e1fc1a03c92d7ae9b51afc17f7c09c
F src/Fossil.h d65a7461d213bcc30f08724d3306c6ee00843217
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
F src/MainWindow.cpp ec6143d24b4a0be026fb46ed65cf02ee04086417
F src/MainWindow.h 7a2ac41cdd205acccd64a5314f25621ecb616288
F src/MainWindow.cpp 5b69ea329562ebcd311a674185d4ec42e7cee713
F src/MainWindow.h f2141839cccb3941df9ed7288588f2de3a5c8179
F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
F src/SearchBox.cpp d4209c575baa9933e1ce5ed376e785b289a145ba
@ -219,10 +219,10 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
F ui/MainWindow.ui 9dd0f9ef3f486413c9af912ac557c0e7bf9c6f50
F ui/MainWindow.ui a35d624f5643b56d0c6f13c4b3eb30bd2d77206c
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
P 37e191368a0f6880991fd27fb08ebf1144f6626f
R fdbfaaf7e049e20aebbeead5bf6d1135
P b49ff56d2af6aca465d8b2ce3b5a9455341e7a1c
R ce5353eef0ea32df84e4f1e586546ba7
U kostas
Z 25c2de0408c1af282fd060662d16444f
Z 5aa327a30bd3d5e5ed1705c3ba145211

2
manifest.uuid
View File

@ -1 +1 @@
b49ff56d2af6aca465d8b2ce3b5a9455341e7a1c
502ce5e1b68dd97da3b9a779e5683d2f1ddcb61c

19
src/MainWindow.cpp
View File

@ -965,6 +965,7 @@ void MainWindow::applySettings()
if(store->contains("ViewAsList"))
{
ui->actionViewAsList->setChecked(store->value("ViewAsList").toBool());
ui->actionViewAsFolders->setChecked(!store->value("ViewAsList").toBool());
viewMode = store->value("ViewAsList").toBool()? VIEWMODE_LIST : VIEWMODE_TREE;
}
//ui->workspaceTreeView->setVisible(viewMode == VIEWMODE_TREE);
@ -1641,10 +1642,18 @@ void MainWindow::on_actionViewIgnored_triggered()
//------------------------------------------------------------------------------
void MainWindow::on_actionViewAsList_triggered()
{
viewMode = ui->actionViewAsList->isChecked() ? VIEWMODE_LIST : VIEWMODE_TREE;
#if 0
ui->workspaceTreeView->setVisible(viewMode == VIEWMODE_TREE);
#endif
ui->actionViewAsFolders->setChecked(!ui->actionViewAsList->isChecked());
viewMode = ui->actionViewAsList->isChecked() ? VIEWMODE_LIST : VIEWMODE_TREE;
updateWorkspaceView();
updateFileView();
}
//------------------------------------------------------------------------------
void MainWindow::on_actionViewAsFolders_triggered()
{
ui->actionViewAsList->setChecked(!ui->actionViewAsFolders->isChecked());
viewMode = ui->actionViewAsList->isChecked() ? VIEWMODE_LIST : VIEWMODE_TREE;
updateWorkspaceView();
updateFileView();
}
@ -2398,3 +2407,5 @@ void MainWindow::onSearch()
searchBox->selectAll();
searchBox->setFocus();
}

1
src/MainWindow.h
View File

@ -105,6 +105,7 @@ private slots:
void on_actionViewUnknown_triggered();
void on_actionViewIgnored_triggered();
void on_actionViewAsList_triggered();
void on_actionViewAsFolders_triggered();
void on_actionOpenFolder_triggered();
void on_actionRenameFolder_triggered();
void on_actionNewRepository_triggered();

15
ui/MainWindow.ui
View File

@ -259,6 +259,7 @@
<addaction name="actionViewIgnored"/>
<addaction name="separator"/>
<addaction name="actionViewAsList"/>
<addaction name="actionViewAsFolders"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuView"/>
@ -934,6 +935,20 @@
<string>Merge Branch</string>
</property>
</action>
<action name="actionViewAsFolders">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Files and F&amp;olders</string>
</property>
<property name="toolTip">
<string>View files and folders</string>
</property>
<property name="statusTip">
<string>View the workspace as files and folders</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>