Neal Wilson 10 лет назад
Родитель
Сommit
230b0fb9c4
3 измененных файлов: 26 добавлений и 21 удалений
  1. 15
    13
      src/graphsettings.w
  2. 7
    4
      src/settings.w
  3. 4
    4
      src/typica.w

+ 15
- 13
src/graphsettings.w Просмотреть файл

6
 configure secondary axes.
6
 configure secondary axes.
7
 
7
 
8
 @<Class declarations@>=
8
 @<Class declarations@>=
9
-class GraphSettingsWidget : public QWidget
10
-{
11
-	Q_OBJECT
12
-	public:
9
+class GraphSettingsWidget : public QWidget@/
10
+{@/
11
+	@[Q_OBJECT@]@;
12
+	public:@/
13
 		GraphSettingsWidget();
13
 		GraphSettingsWidget();
14
 };
14
 };
15
 
15
 
22
 think of. If anybody with UI design experience would like to propose something
22
 think of. If anybody with UI design experience would like to propose something
23
 better I would be glad to consider it.
23
 better I would be glad to consider it.
24
 
24
 
25
+@s GraphSettingsRelativeTab int
26
+
25
 @<GraphSettingsWidget implementation@>=
27
 @<GraphSettingsWidget implementation@>=
26
 GraphSettingsWidget::GraphSettingsWidget() : QWidget(NULL)
28
 GraphSettingsWidget::GraphSettingsWidget() : QWidget(NULL)
27
 {
29
 {
42
 also possible to disable the graphing of relative temperature measurements.
44
 also possible to disable the graphing of relative temperature measurements.
43
 
45
 
44
 @<Class declarations@>=
46
 @<Class declarations@>=
45
-class GraphSettingsRelativeTab : public QWidget
46
-{
47
-	Q_OBJECT
48
-	public:
49
-		GraphSettingsRelativeTab();
50
-	public slots:
47
+class GraphSettingsRelativeTab : public QWidget@/
48
+{@/
49
+	@[Q_OBJECT@]@;
50
+	public:@/
51
+		GraphSettingsRelativeTab();@/
52
+	@[public slots@]:@/
51
 		void updateEnableSetting(bool enable);
53
 		void updateEnableSetting(bool enable);
52
 		void updateColorSetting(const QString &color);
54
 		void updateColorSetting(const QString &color);
53
 		void updateAxisSetting(const QString &gridList);
55
 		void updateAxisSetting(const QString &gridList);
54
 		void updateUnit(int unit);
56
 		void updateUnit(int unit);
55
-		void showColorPicker();
56
-	private:
57
+		void showColorPicker();@/
58
+	private:@/
57
 		QLineEdit *colorEdit;
59
 		QLineEdit *colorEdit;
58
 };
60
 };
59
 
61
 
132
 	QStringList numbers;
134
 	QStringList numbers;
133
 	foreach(QString text, points)
135
 	foreach(QString text, points)
134
 	{
136
 	{
135
-		bool okay = false;
137
+		bool okay = @[false@];
136
 		text.toDouble(&okay);
138
 		text.toDouble(&okay);
137
 		if(okay)
139
 		if(okay)
138
 		{
140
 		{

+ 7
- 4
src/settings.w Просмотреть файл

9
 pipeline.
9
 pipeline.
10
 
10
 
11
 @<Class declarations@>=
11
 @<Class declarations@>=
12
-class SettingsWindow : public QMainWindow
13
-{
14
-	Q_OBJECT
15
-	public:
12
+class SettingsWindow : public QMainWindow@/
13
+{@/
14
+	@[Q_OBJECT@]@;
15
+	public:@/
16
 		SettingsWindow();
16
 		SettingsWindow();
17
 };
17
 };
18
 
18
 
20
 functionality is delegated to more specialized widgets that are available
20
 functionality is delegated to more specialized widgets that are available
21
 through a set of tabs.
21
 through a set of tabs.
22
 
22
 
23
+@s QTabWidget int
24
+@s GraphSettingsWidget int
25
+
23
 @<SettingsWindow implementation@>=
26
 @<SettingsWindow implementation@>=
24
 SettingsWindow::SettingsWindow() : QMainWindow(NULL)
27
 SettingsWindow::SettingsWindow() : QMainWindow(NULL)
25
 {
28
 {

+ 4
- 4
src/typica.w Просмотреть файл

16799
 reinitialization of the logging view.
16799
 reinitialization of the logging view.
16800
 
16800
 
16801
 @<Class declarations@>=
16801
 @<Class declarations@>=
16802
-class ReconfigurableAnnotationButtonConfWidget : public BasicDeviceConfigurationWidget
16803
-{
16804
-	@[Q_OBJECT@]@/
16802
+class ReconfigurableAnnotationButtonConfWidget : public BasicDeviceConfigurationWidget@/
16803
+{@/
16804
+	@[Q_OBJECT@]@;
16805
 	public:@/
16805
 	public:@/
16806
-		@[Q_INVOKABLE@] ReconfigurableAnnotationButtonConfWidget(DeviceTreeModel *model, const QModelIndex &index);
16806
+		Q_INVOKABLE ReconfigurableAnnotationButtonConfWidget(DeviceTreeModel *model, const QModelIndex &index);
16807
 	@[private slots@]:@/
16807
 	@[private slots@]:@/
16808
 		void updateButtonText(const QString &text);
16808
 		void updateButtonText(const QString &text);
16809
 		void updateAnnotationText(const QString &text);
16809
 		void updateAnnotationText(const QString &text);

Загрузка…
Отмена
Сохранить