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

Beautified the settings dialog

Browse Source 
Double-clicking a folder in the behaves like open folder


FossilOrigin-Name: 8a4fbbb14628b2dc53b8d46a35a3b4f43182db9c
This commit is contained in:
kostas
2011-10-20 15:36:18 +00:00
parent 15e3cabf23
commit 6ccae8f206
5 changed files with 230 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MainWindow.cpp
View File

@@ -1832,6 +1832,12 @@ void MainWindow::on_actionOpenFolder_triggered()
return; return;
QModelIndex index = selection.indexes().at(0); QModelIndex index = selection.indexes().at(0);
on_treeView_doubleClicked(index);
}
//------------------------------------------------------------------------------
void MainWindow::on_treeView_doubleClicked(const QModelIndex &index)
{
QString target = repoDirModel.data(index, REPODIRMODEL_ROLE_PATH).toString(); QString target = repoDirModel.data(index, REPODIRMODEL_ROLE_PATH).toString();
target = getCurrentWorkspace() + PATH_SEP + target; target = getCurrentWorkspace() + PATH_SEP + target;
@@ -2003,4 +2009,3 @@ _exit:
refresh(); refresh();
} }

1
MainWindow.h
View File

@@ -191,6 +191,7 @@ private slots:
void on_actionHistory_triggered(); void on_actionHistory_triggered();
void on_actionClearLog_triggered(); void on_actionClearLog_triggered();
void on_tableView_doubleClicked(const QModelIndex &index); void on_tableView_doubleClicked(const QModelIndex &index);
void on_treeView_doubleClicked(const QModelIndex &index);
void on_actionOpenFile_triggered(); void on_actionOpenFile_triggered();
void on_actionPush_triggered(); void on_actionPush_triggered();
void on_actionPull_triggered(); void on_actionPull_triggered();

151
SettingsDialog.ui
View File

@@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>544</width> <width>526</width>
<height>186</height> <height>211</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -19,18 +19,42 @@
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tabApp">
<attribute name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Battery-01.png</normaloff>:/icons/icons/Battery-01.png</iconset>
</attribute>
<attribute name="title">
<string>Application</string>
</attribute>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Fossil Path</string> <string>Fossil Path</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<item> <item>
<widget class="QLineEdit" name="lineFossilPath"/> <widget class="QLineEdit" name="lineFossilPath">
<property name="toolTip">
<string>Path to the fossil executable. Leave blank to use the default fossil</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnSelectFossil"> <widget class="QPushButton" name="btnSelectFossil">
@@ -40,6 +64,12 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
@@ -49,15 +79,25 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Graphical Diff </string> <string>Graphical Diff </string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<item> <item>
<widget class="QLineEdit" name="lineGDiffCommand"/> <widget class="QLineEdit" name="lineGDiffCommand">
<property name="toolTip">
<string>Path to graphical diff tool</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnSelectFossilGDiff"> <widget class="QPushButton" name="btnSelectFossilGDiff">
@@ -67,6 +107,12 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
@@ -76,15 +122,25 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Graphical Merge</string> <string>Graphical Merge</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_10">
<item> <item>
<widget class="QLineEdit" name="lineGMergeCommand"/> <widget class="QLineEdit" name="lineGMergeCommand">
<property name="toolTip">
<string>Path to the graphical merge tool</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="btnSelectGMerge"> <widget class="QPushButton" name="btnSelectGMerge">
@@ -94,6 +150,12 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
@@ -101,27 +163,74 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> </layout>
</widget>
<widget class="QWidget" name="tabRepo">
<attribute name="icon">
<iconset resource="resources.qrc">
<normaloff>:/icons/icons/Book-01.png</normaloff>:/icons/icons/Book-01.png</iconset>
</attribute>
<attribute name="title">
<string>Repository</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Ignore List</string> <string>Ignore List</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="lineIgnore"/> <widget class="QLineEdit" name="lineIgnore">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>A comma separated list of paths to ignore in fossil operations</string>
</property>
</widget>
</item> </item>
<item row="4" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Remote Url</string> <string>Remote Url</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="lineRemoteURL"/> <widget class="QLineEdit" name="lineRemoteURL">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>The repote url use push changes</string>
</property>
</widget>
</item> </item>
<item row="5" column="1"> </layout>
</widget>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -132,16 +241,10 @@
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>label_2</zorder>
<zorder>label_3</zorder>
<zorder>label</zorder>
<zorder>label_4</zorder>
<zorder>lineIgnore</zorder>
<zorder>buttonBox</zorder>
<zorder>lineRemoteURL</zorder>
<zorder>label_5</zorder>
</widget> </widget>
<resources/> <resources>
<include location="resources.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

16
manifest
View File

@@ -1,17 +1,17 @@
C Integrated\sall\sfossil/fuel\soptions\sinto\sthe\sSettings\sdialog\nrunFossil\snow\suses\sa\sbitfield\sto\scontrol\sexecution\soptions\nSettings\smanagement\snow\ssucks\sless,\s(but\sstill\senough\ssuckage\sremains)\n\n C Beautified\sthe\ssettings\sdialog\nDouble-clicking\sa\sfolder\sin\sthe\sbehaves\slike\sopen\sfolder\n
D 2011-10-19T16:30:12.635 D 2011-10-20T15:36:18.415
F CommitDialog.cpp 8965e52d077c300cf1acb1b16fb2dcca5c7070f8 F CommitDialog.cpp 8965e52d077c300cf1acb1b16fb2dcca5c7070f8
F CommitDialog.h a9596d99865cf312b419d01d51334ffc916f5508 F CommitDialog.h a9596d99865cf312b419d01d51334ffc916f5508
F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154 F CommitDialog.ui 5067623f6af6f5a42c87df903278e383e945e154
F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8 F FileActionDialog.cpp fcaebf9986f789b3440d5390b3458ad5f86fe0c8
F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce
F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7
F MainWindow.cpp 35de92266b4051a687cb0cd400dc668f1890a8ce F MainWindow.cpp 149a4bdf9ae5f372f3026294c311b53470119a4e
F MainWindow.h 793882064fc9572744f2016ed559f7b9d26632ec F MainWindow.h c16460dfb72df649e5c3bd6057c46d5ceb559106
F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b F MainWindow.ui 7f9e5cda55cffd5da8c01de7729a1806126c0d6b
F SettingsDialog.cpp a386f03a13115b8179361344c830bcdb2c319476 F SettingsDialog.cpp a386f03a13115b8179361344c830bcdb2c319476
F SettingsDialog.h 079e869f60b37feac78198afe0dfd5b75eee9add F SettingsDialog.h 079e869f60b37feac78198afe0dfd5b75eee9add
F SettingsDialog.ui 8e5b742e889665273d11980959f390ec98dacc06 F SettingsDialog.ui 05bc501e63fa74ce3d285ccfdd8c94382e558f32
F fuel.pro b304761003917ba0790be1b62d537642a7e40adb F fuel.pro b304761003917ba0790be1b62d537642a7e40adb
F fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79 F fuel.rc 8e9ac966f283102c11a77cd7f936cdc09e09bd79
F icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8 F icons/Address\sBook-01.png ef2cec80ea5a559b72e8be4a344a1869fe69cbd8
@@ -172,7 +172,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214
F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93 F main.cpp f67a9b5c9ca0b634b19ef08e7136032372d37f93
F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53
P fb85ae054f85e81e64e9d534fe502959f7f1fa2e P 91c5a65b7e4ca4801a6d7632abd7982d2063a1f3
R 5776c676c29c7c55718b710700e50136 R b1e75a926cff0a17e96ba42e01dc5da3
U kostas U kostas
Z 50978861702a0b2ec83192ce7566f1c8 Z df7a5182fb8be64251d47442ec7c00a8

2
manifest.uuid
View File

@@ -1 +1 @@
91c5a65b7e4ca4801a6d7632abd7982d2063a1f3 8a4fbbb14628b2dc53b8d46a35a3b4f43182db9c