Browse Source

Fix typography

Neal Wilson 11 years ago
parent
commit
230b0fb9c4
3 changed files with 26 additions and 21 deletions
  1. 15
    13
      src/graphsettings.w
  2. 7
    4
      src/settings.w
  3. 4
    4
      src/typica.w

+ 15
- 13
src/graphsettings.w View File

@@ -6,10 +6,10 @@ graph widget. The original motivation for the class comes from a need to
6 6
 configure secondary axes.
7 7
 
8 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 13
 		GraphSettingsWidget();
14 14
 };
15 15
 
@@ -22,6 +22,8 @@ tab set becomes excessively large but for now this is the best that I can
22 22
 think of. If anybody with UI design experience would like to propose something
23 23
 better I would be glad to consider it.
24 24
 
25
+@s GraphSettingsRelativeTab int
26
+
25 27
 @<GraphSettingsWidget implementation@>=
26 28
 GraphSettingsWidget::GraphSettingsWidget() : QWidget(NULL)
27 29
 {
@@ -42,18 +44,18 @@ used to construct the relative values and the style of coffee roasting. It is
42 44
 also possible to disable the graphing of relative temperature measurements.
43 45
 
44 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 53
 		void updateEnableSetting(bool enable);
52 54
 		void updateColorSetting(const QString &color);
53 55
 		void updateAxisSetting(const QString &gridList);
54 56
 		void updateUnit(int unit);
55
-		void showColorPicker();
56
-	private:
57
+		void showColorPicker();@/
58
+	private:@/
57 59
 		QLineEdit *colorEdit;
58 60
 };
59 61
 
@@ -132,7 +134,7 @@ void GraphSettingsRelativeTab::updateAxisSetting(const QString &gridList)
132 134
 	QStringList numbers;
133 135
 	foreach(QString text, points)
134 136
 	{
135
-		bool okay = false;
137
+		bool okay = @[false@];
136 138
 		text.toDouble(&okay);
137 139
 		if(okay)
138 140
 		{

+ 7
- 4
src/settings.w View File

@@ -9,10 +9,10 @@ for settings that do not logically belong with a single part of the measurement
9 9
 pipeline.
10 10
 
11 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 16
 		SettingsWindow();
17 17
 };
18 18
 
@@ -20,6 +20,9 @@ class SettingsWindow : public QMainWindow
20 20
 functionality is delegated to more specialized widgets that are available
21 21
 through a set of tabs.
22 22
 
23
+@s QTabWidget int
24
+@s GraphSettingsWidget int
25
+
23 26
 @<SettingsWindow implementation@>=
24 27
 SettingsWindow::SettingsWindow() : QMainWindow(NULL)
25 28
 {

+ 4
- 4
src/typica.w View File

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

Loading…
Cancel
Save