Forssim

Merge lp:~par-hellstrom/forssim/removedEnableLabelAndTool into lp:forssim

  1. removedEnableLabelAndTool
  2. Merge into development
Proposed by parhe
Status: Merged
Merged at revision: not available
Proposed branch: lp:~par-hellstrom/forssim/removedEnableLabelAndTool
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~par-hellstrom/forssim/removedEnableLabelAndTool
Reviewer Review Type Date Requested Status
parhe (community) Approve
Review via email: mp+10145@code.launchpad.net
To post a comment you must log in.
Revision history for this message
parhe (par-hellstrom) wrote :

Merge this!

Revision history for this message
parhe (par-hellstrom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/RemoveWisdomToothWindow.cpp'
2--- FsWisdom/RemoveWisdomToothWindow.cpp 2009-08-13 13:42:34 +0000
3+++ FsWisdom/RemoveWisdomToothWindow.cpp 2009-08-14 11:11:30 +0000
4@@ -191,7 +191,6 @@
5 //Be sure that buttons are in default-state (on user tab at least).
6 ui.headButton->setChecked(true);
7 ui.teethButton->setChecked(true);
8- ui.toolButton->setChecked(true);
9 ui.selectDrillButton->setChecked(true);
10 ui.selectElevatorButton->setChecked(false);
11 ui.highlightUserButton->setChecked(false);
12@@ -396,9 +395,11 @@
13 ui.playstop_2->setEnabled(false);
14 ui.ffw_2->setEnabled(false);
15 ui.reset_2->setEnabled(false);
16- ui.pushButton->setEnabled(false);
17 ui.playbacktime_2->setEnabled(false);
18 ui.playbacklabel_2->setEnabled(false);
19+ ui.toolButton->setChecked(true);
20+ toggleShowHideTool();
21+ ui.toolButton->setEnabled(true);
22 }
23
24 void RemoveWisdomToothWindow::enablePlayback()
25@@ -407,8 +408,10 @@
26 ui.playstop_2->setEnabled(true);
27 ui.ffw_2->setEnabled(true);
28 ui.reset_2->setEnabled(true);
29- ui.pushButton->setEnabled(true);
30 ui.playbacktime_2->setEnabled(true);
31 ui.playbacklabel_2->setEnabled(true);
32+ ui.toolButton->setChecked(false);
33+ toggleShowHideTool();
34+ ui.toolButton->setEnabled(false);
35 }
36
37
38=== modified file 'FsWisdom/RemoveWisdomToothWindow.ui'
39--- FsWisdom/RemoveWisdomToothWindow.ui 2009-08-13 12:30:01 +0000
40+++ FsWisdom/RemoveWisdomToothWindow.ui 2009-08-14 11:11:30 +0000
41@@ -159,19 +159,6 @@
42 <string>%vs</string>
43 </property>
44 </widget>
45- <widget class="QPushButton" name="pushButton" >
46- <property name="geometry" >
47- <rect>
48- <x>330</x>
49- <y>120</y>
50- <width>80</width>
51- <height>28</height>
52- </rect>
53- </property>
54- <property name="text" >
55- <string>Enable</string>
56- </property>
57- </widget>
58 </widget>
59 <widget class="QLabel" name="stateLabel_2" >
60 <property name="geometry" >

Subscribers

People subscribed via source and target branches

to all changes: