diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-23 11:27:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-23 11:27:26 -0300 |
| commit | 2ecf4dd80ecae9aaa416a5567d9ad102482fc4e5 (patch) | |
| tree | 8320eb9e98e1122ed1441cfeb27ecea6e07a60dd /src/leap/bitmask/gui/ui/mainwindow.ui | |
| parent | 0b449949cc31f25cd17ff2bdf2d9b0539499f8f8 (diff) | |
| parent | 7d10092df85a91db5e40b0eb36d4bb2cc67f6d05 (diff) | |
Merge remote-tracking branch 'ivan/feature/2796_create-preferences-panel' into develop
Diffstat (limited to 'src/leap/bitmask/gui/ui/mainwindow.ui')
| -rw-r--r-- | src/leap/bitmask/gui/ui/mainwindow.ui | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui index 9c4e6ff0..834a562e 100644 --- a/src/leap/bitmask/gui/ui/mainwindow.ui +++ b/src/leap/bitmask/gui/ui/mainwindow.ui @@ -215,6 +215,16 @@ <item row="18" column="2"> <layout class="QHBoxLayout" name="horizontalLayout"> <item> + <widget class="QPushButton" name="btnPreferences"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Preferences</string> + </property> + </widget> + </item> + <item> <spacer name="horizontalSpacer_10"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -310,7 +320,6 @@ <resources> <include location="../../../../../data/resources/mainwindow.qrc"/> <include location="../../../../../data/resources/locale.qrc"/> - <include location="../../../../data/resources/mainwindow.qrc"/> </resources> <connections/> </ui> |