|
@@ -33,11 +33,6 @@
|
33
|
33
|
<button name="Update Inventory" id="inventory" type="push" />
|
34
|
34
|
</column>
|
35
|
35
|
</row>
|
36
|
|
- <row>
|
37
|
|
- <column>
|
38
|
|
- <button name="Batch Log" id="history" type="push" />
|
39
|
|
- </column>
|
40
|
|
- </row>
|
41
|
36
|
<row>
|
42
|
37
|
<column>
|
43
|
38
|
<button name="New Cupping Session" id="createcupping"
|
|
@@ -132,11 +127,6 @@ type="push" />
|
132
|
127
|
var invwin = createWindow("inventory");
|
133
|
128
|
invwin.windowTitle = "Typica - Inventory";
|
134
|
129
|
});
|
135
|
|
- var history = findChildObject(this, 'history');
|
136
|
|
- history.clicked.connect(function() {
|
137
|
|
- var histwindow = createWindow("history");
|
138
|
|
- histwindow.windowTitle = "Typica - Batch Log";
|
139
|
|
- });
|
140
|
130
|
var roastspecbutton = findChildObject(this, 'roastspec');
|
141
|
131
|
roastspecbutton.clicked.connect(function() {
|
142
|
132
|
var specwindow = createWindow("roastspec");
|
|
@@ -161,20 +151,19 @@ type="push" />
|
161
|
151
|
{
|
162
|
152
|
window.loggingWindow = createWindow("basicWindow");
|
163
|
153
|
window.loggingWindow.windowTitle = "Typica [*]";
|
164
|
|
- window.loggingWindow.navigationWindow = window;
|
|
154
|
+ window.loggingWindow.navigationWindow = window;
|
165
|
155
|
}
|
166
|
156
|
else
|
167
|
157
|
{
|
168
|
|
- print(window.loggingWindow);
|
169
|
158
|
window.loggingWindow.raise();
|
170
|
159
|
window.loggingWindow.activateWindow();
|
171
|
160
|
}
|
172
|
161
|
});
|
173
|
|
- var configurebutton = findChildObject(this, 'configure');
|
174
|
|
- configurebutton.clicked.connect(function() {
|
175
|
|
- var confwindow = new SettingsWindow;
|
176
|
|
- confwindow.show();
|
177
|
|
- });
|
|
162
|
+ var configurebutton = findChildObject(this, 'configure');
|
|
163
|
+ configurebutton.clicked.connect(function() {
|
|
164
|
+ var confwindow = new SettingsWindow;
|
|
165
|
+ confwindow.show();
|
|
166
|
+ });
|
178
|
167
|
<![CDATA[
|
179
|
168
|
var DBCreateBase = function() {
|
180
|
169
|
var query = new QSqlQuery();
|