randy-qt

Merge lp:~gaurav-pawaskar/randy-qt/Minor_changes_finishing_updated into lp:randy-qt

  1. Minor_changes_finishing_updated
  2. Merge into Randyqt
Proposed by Gaurav Pawaskar
Status: Merged
Merged at revision: 11
Proposed branch: lp:~gaurav-pawaskar/randy-qt/Minor_changes_finishing_updated
Merge into: lp:randy-qt
Diff against target: 672 lines (+454/-5) (has conflicts)
5 files modified
mainwindow.cpp (+77/-0)
mainwindow.h (+17/-2)
mainwindow.ui (+236/-1)
moc_mainwindow.cpp (+21/-0)
ui_mainwindow.h (+103/-2)
Text conflict in mainwindow.cpp
Text conflict in mainwindow.h
Text conflict in mainwindow.ui
Text conflict in moc_mainwindow.cpp
Text conflict in ui_mainwindow.h
To merge this branch: bzr merge lp:~gaurav-pawaskar/randy-qt/Minor_changes_finishing_updated
Reviewer Review Type Date Requested Status
Duane Hinnen Approve
Review via email: mp+54948@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Duane Hinnen (duanedesign) wrote :

their were some conflicts, Guarev too cake of those. Looks great

Revision history for this message
Duane Hinnen (duanedesign) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mainwindow.cpp'
--- mainwindow.cpp 2011-03-21 18:37:01 +0000
+++ mainwindow.cpp 2011-03-26 06:06:39 +0000
@@ -3,12 +3,20 @@
3MainWindow::MainWindow(QWidget *parent) :3MainWindow::MainWindow(QWidget *parent) :
4 QMainWindow(parent),4 QMainWindow(parent),
5 ui(new Ui :: MainWindow)5 ui(new Ui :: MainWindow)
6<<<<<<< TREE
6 {7 {
7 qsrand(time(0));8 qsrand(time(0));
8 ui -> setupUi(this);9 ui -> setupUi(this);
9 setTable("");10 setTable("");
10 //connect(ui -> actionRegenerate_PasswordCard, SIGNAL(triggered()), this, SLOT(on_regenerate_PasswordCard_triggered()));11 //connect(ui -> actionRegenerate_PasswordCard, SIGNAL(triggered()), this, SLOT(on_regenerate_PasswordCard_triggered()));
11 }12 }
13=======
14 {
15 qsrand(time(0));
16 ui -> setupUi(this);
17 setTable("");
18 }
19>>>>>>> MERGE-SOURCE
1220
13MainWindow::~MainWindow()21MainWindow::~MainWindow()
14{22{
@@ -161,8 +169,12 @@
161 {169 {
162 key[i] = keyString[i];170 key[i] = keyString[i];
163 }171 }
172<<<<<<< TREE
164 //ui->lineEdit->setText(QApplication::translate("MainWindow", key, 0, QApplication::UnicodeUTF8));173 //ui->lineEdit->setText(QApplication::translate("MainWindow", key, 0, QApplication::UnicodeUTF8));
174=======
175>>>>>>> MERGE-SOURCE
165 setTable(key);176 setTable(key);
177<<<<<<< TREE
166178
167 QMessageBox msgBox;179 QMessageBox msgBox;
168 char *msg = (char*)malloc(200*sizeof(char));180 char *msg = (char*)malloc(200*sizeof(char));
@@ -226,3 +238,68 @@
226 msgBox.exec();238 msgBox.exec();
227 }239 }
228}240}
241=======
242 ui->keyLineEdit->setText(QApplication::translate("MainWindow", key, 0, QApplication::UnicodeUTF8));
243
244 QMessageBox msgBox;
245 char *msg = (char*)malloc(200*sizeof(char));
246 strcpy(msg, "Please save your key : ");
247 strcat(msg, key);
248 msgBox.setText(msg);
249 msgBox.exec();
250}
251
252void MainWindow::on_actionSave_triggered()
253{
254 QRect r1(0, 0, 470, 265);
255
256 QImage image(r1.size(), QImage::Format_ARGB32_Premultiplied);
257 ui->tableWidget->render(&image, r1.topLeft(), r1, QWidget::DrawWindowBackground | QWidget::DrawChildren);
258 QPrinter printer;
259 QPrintDialog printDialog(&printer, this);
260 if (printDialog.exec()) {
261 QPainter painter(&printer);
262 painter.setViewport(0, 0,470, 265);
263 painter.setWindow(r1);
264 painter.drawImage(0, 0, image);
265 }
266}
267
268void MainWindow::on_actionRegenerate_PasswordCard_triggered()
269{
270 bool ok;
271 QString text = QInputDialog::getText(this, tr("QInputDialog::getText()"),
272 tr("Regeneration Key:"), QLineEdit::Normal,
273 NULL, &ok);
274
275 if ( ok && !text.isEmpty() )
276 {
277 //Message Box for wrong formatted regenerateKey string
278 QMessageBox msgBox;
279 char *msg = (char*)malloc(100*sizeof(char));
280 strcpy(msg, "Wrong format, Please enter 16 Hex digits in capital ");
281
282 QString regenerateKey = text;
283
284 /*Regular Expreesion to check whether string is HEX & in
285 captial letters*/
286 QRegExp rx("[0-9A-F]{1,16}");
287
288 // Checks regenerateKey to be a 16 HEX digits in CAPS
289 if((regenerateKey.length()==16) && (rx.exactMatch(regenerateKey) ))
290 setTable(regenerateKey.toStdString());
291 else
292 {
293 msgBox.setText(msg);
294 msgBox.exec();
295 }
296 }
297 else
298 {
299 QMessageBox msgBox;
300 char *msg = (char*)malloc(100*sizeof(char));
301 strcpy(msg, "Enter Regeneration key.");
302 msgBox.setText(msg);
303 msgBox.exec();
304 }
305}>>>>>>> MERGE-SOURCE
229306
=== modified file 'mainwindow.h'
--- mainwindow.h 2011-03-21 18:37:01 +0000
+++ mainwindow.h 2011-03-26 06:06:39 +0000
@@ -19,8 +19,15 @@
19#include "ui_mainwindow.h"19#include "ui_mainwindow.h"
20#include "md5.h"20#include "md5.h"
21#include "randyUtil.h"21#include "randyUtil.h"
22#include <QPrintDialog>22<<<<<<< TREE
23#include <QPainter>23#include <QPrintDialog>
24#include <QPainter>
25=======
26#include <QPrintDialog>
27#include <QPrinter>
28#include <QPainter>
29#include <QPrintDialog>
30>>>>>>> MERGE-SOURCE
2431
2532
26namespace Ui {33namespace Ui {
@@ -56,9 +63,17 @@
5663
5764
58private slots:65private slots:
66<<<<<<< TREE
59 void on_actionSavePrint_triggered();67 void on_actionSavePrint_triggered();
68=======
69 void on_actionRegenerate_PasswordCard_triggered();
70 void on_actionSave_triggered();
71>>>>>>> MERGE-SOURCE
60 void on_pb_Generate_clicked();72 void on_pb_Generate_clicked();
73<<<<<<< TREE
61 void on_actionRegenerate_PasswordCard_triggered();74 void on_actionRegenerate_PasswordCard_triggered();
75=======
76>>>>>>> MERGE-SOURCE
62};77};
6378
64#endif // MAINWINDOW_H79#endif // MAINWINDOW_H
6580
=== modified file 'mainwindow.ui'
--- mainwindow.ui 2011-03-21 18:37:01 +0000
+++ mainwindow.ui 2011-03-26 06:06:39 +0000
@@ -11,9 +11,10 @@
11 </rect>11 </rect>
12 </property>12 </property>
13 <property name="windowTitle">13 <property name="windowTitle">
14 <string>MainWindow</string>14 <string>Randy</string>
15 </property>15 </property>
16 <widget class="QWidget" name="centralWidget">16 <widget class="QWidget" name="centralWidget">
17<<<<<<< TREE
17 <layout class="QVBoxLayout" name="verticalLayout">18 <layout class="QVBoxLayout" name="verticalLayout">
18 <item>19 <item>
19 <layout class="QHBoxLayout" name="horizontalLayout">20 <layout class="QHBoxLayout" name="horizontalLayout">
@@ -205,6 +206,234 @@
205 </layout>206 </layout>
206 </item>207 </item>
207 </layout>208 </layout>
209=======
210 <layout class="QVBoxLayout" name="verticalLayout">
211 <item>
212 <layout class="QHBoxLayout" name="horizontalLayout_2">
213 <property name="leftMargin">
214 <number>3</number>
215 </property>
216 <property name="rightMargin">
217 <number>3</number>
218 </property>
219 <property name="bottomMargin">
220 <number>0</number>
221 </property>
222 <item>
223 <widget class="QLabel" name="keyGenerateLabel">
224 <property name="text">
225 <string>Password card Key</string>
226 </property>
227 </widget>
228 </item>
229 <item>
230 <spacer name="horizontalSpacer_2">
231 <property name="orientation">
232 <enum>Qt::Horizontal</enum>
233 </property>
234 <property name="sizeHint" stdset="0">
235 <size>
236 <width>40</width>
237 <height>20</height>
238 </size>
239 </property>
240 </spacer>
241 </item>
242 <item>
243 <widget class="QLineEdit" name="keyLineEdit">
244 <property name="readOnly">
245 <bool>true</bool>
246 </property>
247 </widget>
248 </item>
249 <item>
250 <spacer name="horizontalSpacer">
251 <property name="orientation">
252 <enum>Qt::Horizontal</enum>
253 </property>
254 <property name="sizeHint" stdset="0">
255 <size>
256 <width>40</width>
257 <height>20</height>
258 </size>
259 </property>
260 </spacer>
261 </item>
262 <item>
263 <widget class="QCheckBox" name="symbols">
264 <property name="text">
265 <string>Use Symbols</string>
266 </property>
267 </widget>
268 </item>
269 </layout>
270 </item>
271 <item>
272 <widget class="QTableWidget" name="tableWidget">
273 <property name="enabled">
274 <bool>false</bool>
275 </property>
276 <property name="whatsThis">
277 <string/>
278 </property>
279 <property name="selectionMode">
280 <enum>QAbstractItemView::NoSelection</enum>
281 </property>
282 <attribute name="horizontalHeaderDefaultSectionSize">
283 <number>30</number>
284 </attribute>
285 <attribute name="horizontalHeaderMinimumSectionSize">
286 <number>30</number>
287 </attribute>
288 <row>
289 <property name="text">
290 <string>1</string>
291 </property>
292 </row>
293 <row>
294 <property name="text">
295 <string>2</string>
296 </property>
297 </row>
298 <row>
299 <property name="text">
300 <string>3</string>
301 </property>
302 </row>
303 <row>
304 <property name="text">
305 <string>4</string>
306 </property>
307 </row>
308 <row>
309 <property name="text">
310 <string>5</string>
311 </property>
312 </row>
313 <row>
314 <property name="text">
315 <string>6</string>
316 </property>
317 </row>
318 <row>
319 <property name="text">
320 <string>7</string>
321 </property>
322 </row>
323 <row>
324 <property name="text">
325 <string>8</string>
326 </property>
327 </row>
328 <column>
329 <property name="text">
330 <string>A</string>
331 </property>
332 </column>
333 <column>
334 <property name="text">
335 <string>B</string>
336 </property>
337 </column>
338 <column>
339 <property name="text">
340 <string>C</string>
341 </property>
342 </column>
343 <column>
344 <property name="text">
345 <string>D</string>
346 </property>
347 </column>
348 <column>
349 <property name="text">
350 <string>E</string>
351 </property>
352 </column>
353 <column>
354 <property name="text">
355 <string>F</string>
356 </property>
357 </column>
358 <column>
359 <property name="text">
360 <string>G</string>
361 </property>
362 </column>
363 <column>
364 <property name="text">
365 <string>H</string>
366 </property>
367 </column>
368 <column>
369 <property name="text">
370 <string>I</string>
371 </property>
372 </column>
373 <column>
374 <property name="text">
375 <string>J</string>
376 </property>
377 </column>
378 <column>
379 <property name="text">
380 <string>K</string>
381 </property>
382 </column>
383 <column>
384 <property name="text">
385 <string>L</string>
386 </property>
387 </column>
388 <column>
389 <property name="text">
390 <string>M</string>
391 </property>
392 </column>
393 <column>
394 <property name="text">
395 <string>N</string>
396 </property>
397 </column>
398 <column>
399 <property name="text">
400 <string>O</string>
401 </property>
402 </column>
403 </widget>
404 </item>
405 <item>
406 <layout class="QHBoxLayout" name="horizontalLayout">
407 <property name="leftMargin">
408 <number>3</number>
409 </property>
410 <property name="rightMargin">
411 <number>3</number>
412 </property>
413 <item>
414 <spacer name="horizontalSpacer_3">
415 <property name="orientation">
416 <enum>Qt::Horizontal</enum>
417 </property>
418 <property name="sizeHint" stdset="0">
419 <size>
420 <width>88</width>
421 <height>20</height>
422 </size>
423 </property>
424 </spacer>
425 </item>
426 <item>
427 <widget class="QPushButton" name="pb_Generate">
428 <property name="text">
429 <string>Generate</string>
430 </property>
431 </widget>
432 </item>
433 </layout>
434 </item>
435 </layout>
436>>>>>>> MERGE-SOURCE
208 </widget>437 </widget>
209 <widget class="QMenuBar" name="menuBar">438 <widget class="QMenuBar" name="menuBar">
210 <property name="geometry">439 <property name="geometry">
@@ -221,6 +450,7 @@
221 </property>450 </property>
222 <addaction name="actionSavePrint"/>451 <addaction name="actionSavePrint"/>
223 <addaction name="actionRegenerate_PasswordCard"/>452 <addaction name="actionRegenerate_PasswordCard"/>
453 <addaction name="actionSave"/>
224 </widget>454 </widget>
225 <addaction name="menuFile"/>455 <addaction name="menuFile"/>
226 </widget>456 </widget>
@@ -235,6 +465,11 @@
235 <string>Regenerate PasswordCard</string>465 <string>Regenerate PasswordCard</string>
236 </property>466 </property>
237 </action>467 </action>
468 <action name="actionSave">
469 <property name="text">
470 <string>Save</string>
471 </property>
472 </action>
238 </widget>473 </widget>
239 <layoutdefault spacing="6" margin="11"/>474 <layoutdefault spacing="6" margin="11"/>
240 <resources/>475 <resources/>
241476
=== modified file 'moc_mainwindow.cpp'
--- moc_mainwindow.cpp 2011-03-21 18:37:01 +0000
+++ moc_mainwindow.cpp 2011-03-26 06:06:39 +0000
@@ -1,7 +1,11 @@
1/****************************************************************************1/****************************************************************************
2** Meta object code from reading C++ file 'mainwindow.h'2** Meta object code from reading C++ file 'mainwindow.h'
3**3**
4<<<<<<< TREE
4** Created: Mon Mar 14 14:35:28 20115** Created: Mon Mar 14 14:35:28 2011
6=======
7** Created: Mon Mar 14 10:09:42 2011
8>>>>>>> MERGE-SOURCE
5** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0)9** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0)
6**10**
7** WARNING! All changes made in this file will be lost!11** WARNING! All changes made in this file will be lost!
@@ -32,16 +36,27 @@
3236
33 // slots: signature, parameters, type, tag, flags37 // slots: signature, parameters, type, tag, flags
34 12, 11, 11, 11, 0x08,38 12, 11, 11, 11, 0x08,
39<<<<<<< TREE
35 43, 11, 11, 11, 0x08,40 43, 11, 11, 11, 0x08,
36 68, 11, 11, 11, 0x08,41 68, 11, 11, 11, 0x08,
42=======
43 57, 11, 11, 11, 0x08,
44 83, 11, 11, 11, 0x08,
45>>>>>>> MERGE-SOURCE
3746
38 0 // eod47 0 // eod
39};48};
4049
41static const char qt_meta_stringdata_MainWindow[] = {50static const char qt_meta_stringdata_MainWindow[] = {
51<<<<<<< TREE
42 "MainWindow\0\0on_actionSavePrint_triggered()\0"52 "MainWindow\0\0on_actionSavePrint_triggered()\0"
43 "on_pb_Generate_clicked()\0"53 "on_pb_Generate_clicked()\0"
44 "on_actionRegenerate_PasswordCard_triggered()\0"54 "on_actionRegenerate_PasswordCard_triggered()\0"
55=======
56 "MainWindow\0\0on_actionRegenerate_PasswordCard_triggered()\0"
57 "on_actionSave_triggered()\0"
58 "on_pb_Generate_clicked()\0"
59>>>>>>> MERGE-SOURCE
45};60};
4661
47const QMetaObject MainWindow::staticMetaObject = {62const QMetaObject MainWindow::staticMetaObject = {
@@ -73,9 +88,15 @@
73 return _id;88 return _id;
74 if (_c == QMetaObject::InvokeMetaMethod) {89 if (_c == QMetaObject::InvokeMetaMethod) {
75 switch (_id) {90 switch (_id) {
91<<<<<<< TREE
76 case 0: on_actionSavePrint_triggered(); break;92 case 0: on_actionSavePrint_triggered(); break;
77 case 1: on_pb_Generate_clicked(); break;93 case 1: on_pb_Generate_clicked(); break;
78 case 2: on_actionRegenerate_PasswordCard_triggered(); break;94 case 2: on_actionRegenerate_PasswordCard_triggered(); break;
95=======
96 case 0: on_actionRegenerate_PasswordCard_triggered(); break;
97 case 1: on_actionSave_triggered(); break;
98 case 2: on_pb_Generate_clicked(); break;
99>>>>>>> MERGE-SOURCE
79 default: ;100 default: ;
80 }101 }
81 _id -= 3;102 _id -= 3;
82103
=== modified file 'randy'
83Binary files randy 2011-03-11 19:45:29 +0000 and randy 2011-03-26 06:06:39 +0000 differ104Binary files randy 2011-03-11 19:45:29 +0000 and randy 2011-03-26 06:06:39 +0000 differ
=== modified file 'ui_mainwindow.h'
--- ui_mainwindow.h 2011-03-21 18:37:01 +0000
+++ ui_mainwindow.h 2011-03-26 06:06:39 +0000
@@ -1,7 +1,11 @@
1/********************************************************************************1/********************************************************************************
2** Form generated from reading UI file 'mainwindow.ui'2** Form generated from reading UI file 'mainwindow.ui'
3**3**
4<<<<<<< TREE
4** Created: Mon Mar 14 14:35:20 20115** Created: Mon Mar 14 14:35:20 2011
6=======
7** Created: Mon Mar 14 10:09:39 2011
8>>>>>>> MERGE-SOURCE
5** by: Qt User Interface Compiler version 4.7.09** by: Qt User Interface Compiler version 4.7.0
6**10**
7** WARNING! All changes made in this file will be lost when recompiling UI file!11** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -35,15 +39,31 @@
35public:39public:
36 QAction *actionSavePrint;40 QAction *actionSavePrint;
37 QAction *actionRegenerate_PasswordCard;41 QAction *actionRegenerate_PasswordCard;
42 QAction *actionSave;
38 QWidget *centralWidget;43 QWidget *centralWidget;
44<<<<<<< TREE
39 QVBoxLayout *verticalLayout;45 QVBoxLayout *verticalLayout;
40 QHBoxLayout *horizontalLayout;46 QHBoxLayout *horizontalLayout;
41 QLabel *keyGenerateLabel;47 QLabel *keyGenerateLabel;
42 QSpacerItem *horizontalSpacer;48 QSpacerItem *horizontalSpacer;
43 QCheckBox *symbols;49 QCheckBox *symbols;
50=======
51 QVBoxLayout *verticalLayout;
52 QHBoxLayout *horizontalLayout_2;
53 QLabel *keyGenerateLabel;
54 QSpacerItem *horizontalSpacer_2;
55 QLineEdit *keyLineEdit;
56 QSpacerItem *horizontalSpacer;
57 QCheckBox *symbols;
58>>>>>>> MERGE-SOURCE
44 QTableWidget *tableWidget;59 QTableWidget *tableWidget;
60<<<<<<< TREE
45 QHBoxLayout *horizontalLayout_2;61 QHBoxLayout *horizontalLayout_2;
46 QSpacerItem *horizontalSpacer_2;62 QSpacerItem *horizontalSpacer_2;
63=======
64 QHBoxLayout *horizontalLayout;
65 QSpacerItem *horizontalSpacer_3;
66>>>>>>> MERGE-SOURCE
47 QPushButton *pb_Generate;67 QPushButton *pb_Generate;
48 QMenuBar *menuBar;68 QMenuBar *menuBar;
49 QMenu *menuFile;69 QMenu *menuFile;
@@ -53,13 +73,22 @@
53 {73 {
54 if (MainWindow->objectName().isEmpty())74 if (MainWindow->objectName().isEmpty())
55 MainWindow->setObjectName(QString::fromUtf8("MainWindow"));75 MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
76<<<<<<< TREE
56 MainWindow->resize(492, 402);77 MainWindow->resize(492, 402);
57 actionSavePrint = new QAction(MainWindow);78 actionSavePrint = new QAction(MainWindow);
58 actionSavePrint->setObjectName(QString::fromUtf8("actionSavePrint"));79 actionSavePrint->setObjectName(QString::fromUtf8("actionSavePrint"));
80=======
81 MainWindow->resize(492, 402);
82 actionPrint = new QAction(MainWindow);
83 actionPrint->setObjectName(QString::fromUtf8("actionPrint"));
84>>>>>>> MERGE-SOURCE
59 actionRegenerate_PasswordCard = new QAction(MainWindow);85 actionRegenerate_PasswordCard = new QAction(MainWindow);
60 actionRegenerate_PasswordCard->setObjectName(QString::fromUtf8("actionRegenerate_PasswordCard"));86 actionRegenerate_PasswordCard->setObjectName(QString::fromUtf8("actionRegenerate_PasswordCard"));
87 actionSave = new QAction(MainWindow);
88 actionSave->setObjectName(QString::fromUtf8("actionSave"));
61 centralWidget = new QWidget(MainWindow);89 centralWidget = new QWidget(MainWindow);
62 centralWidget->setObjectName(QString::fromUtf8("centralWidget"));90 centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
91<<<<<<< TREE
63 verticalLayout = new QVBoxLayout(centralWidget);92 verticalLayout = new QVBoxLayout(centralWidget);
64 verticalLayout->setSpacing(6);93 verticalLayout->setSpacing(6);
65 verticalLayout->setContentsMargins(11, 11, 11, 11);94 verticalLayout->setContentsMargins(11, 11, 11, 11);
@@ -84,6 +113,43 @@
84113
85 verticalLayout->addLayout(horizontalLayout);114 verticalLayout->addLayout(horizontalLayout);
86115
116=======
117 verticalLayout = new QVBoxLayout(centralWidget);
118 verticalLayout->setSpacing(6);
119 verticalLayout->setContentsMargins(11, 11, 11, 11);
120 verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
121 horizontalLayout_2 = new QHBoxLayout();
122 horizontalLayout_2->setSpacing(6);
123 horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
124 horizontalLayout_2->setContentsMargins(3, -1, 3, 0);
125 keyGenerateLabel = new QLabel(centralWidget);
126 keyGenerateLabel->setObjectName(QString::fromUtf8("keyGenerateLabel"));
127
128 horizontalLayout_2->addWidget(keyGenerateLabel);
129
130 horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
131
132 horizontalLayout_2->addItem(horizontalSpacer_2);
133
134 keyLineEdit = new QLineEdit(centralWidget);
135 keyLineEdit->setObjectName(QString::fromUtf8("keyLineEdit"));
136 keyLineEdit->setReadOnly(true);
137
138 horizontalLayout_2->addWidget(keyLineEdit);
139
140 horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
141
142 horizontalLayout_2->addItem(horizontalSpacer);
143
144 symbols = new QCheckBox(centralWidget);
145 symbols->setObjectName(QString::fromUtf8("symbols"));
146
147 horizontalLayout_2->addWidget(symbols);
148
149
150 verticalLayout->addLayout(horizontalLayout_2);
151
152>>>>>>> MERGE-SOURCE
87 tableWidget = new QTableWidget(centralWidget);153 tableWidget = new QTableWidget(centralWidget);
88 if (tableWidget->columnCount() < 15)154 if (tableWidget->columnCount() < 15)
89 tableWidget->setColumnCount(15);155 tableWidget->setColumnCount(15);
@@ -140,6 +206,7 @@
140 tableWidget->setSelectionMode(QAbstractItemView::NoSelection);206 tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
141 tableWidget->horizontalHeader()->setDefaultSectionSize(30);207 tableWidget->horizontalHeader()->setDefaultSectionSize(30);
142 tableWidget->horizontalHeader()->setMinimumSectionSize(30);208 tableWidget->horizontalHeader()->setMinimumSectionSize(30);
209<<<<<<< TREE
143210
144 verticalLayout->addWidget(tableWidget);211 verticalLayout->addWidget(tableWidget);
145212
@@ -150,14 +217,36 @@
150217
151 horizontalLayout_2->addItem(horizontalSpacer_2);218 horizontalLayout_2->addItem(horizontalSpacer_2);
152219
220=======
221
222 verticalLayout->addWidget(tableWidget);
223
224 horizontalLayout = new QHBoxLayout();
225 horizontalLayout->setSpacing(6);
226 horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
227 horizontalLayout->setContentsMargins(3, -1, 3, -1);
228 horizontalSpacer_3 = new QSpacerItem(88, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
229
230 horizontalLayout->addItem(horizontalSpacer_3);
231
232>>>>>>> MERGE-SOURCE
153 pb_Generate = new QPushButton(centralWidget);233 pb_Generate = new QPushButton(centralWidget);
154 pb_Generate->setObjectName(QString::fromUtf8("pb_Generate"));234 pb_Generate->setObjectName(QString::fromUtf8("pb_Generate"));
235<<<<<<< TREE
155236
156 horizontalLayout_2->addWidget(pb_Generate);237 horizontalLayout_2->addWidget(pb_Generate);
157238
158239
159 verticalLayout->addLayout(horizontalLayout_2);240 verticalLayout->addLayout(horizontalLayout_2);
160241
242=======
243
244 horizontalLayout->addWidget(pb_Generate);
245
246
247 verticalLayout->addLayout(horizontalLayout);
248
249>>>>>>> MERGE-SOURCE
161 MainWindow->setCentralWidget(centralWidget);250 MainWindow->setCentralWidget(centralWidget);
162 menuBar = new QMenuBar(MainWindow);251 menuBar = new QMenuBar(MainWindow);
163 menuBar->setObjectName(QString::fromUtf8("menuBar"));252 menuBar->setObjectName(QString::fromUtf8("menuBar"));
@@ -172,6 +261,7 @@
172 menuBar->addAction(menuFile->menuAction());261 menuBar->addAction(menuFile->menuAction());
173 menuFile->addAction(actionSavePrint);262 menuFile->addAction(actionSavePrint);
174 menuFile->addAction(actionRegenerate_PasswordCard);263 menuFile->addAction(actionRegenerate_PasswordCard);
264 menuFile->addAction(actionSave);
175265
176 retranslateUi(MainWindow);266 retranslateUi(MainWindow);
177267
@@ -180,11 +270,22 @@
180270
181 void retranslateUi(QMainWindow *MainWindow)271 void retranslateUi(QMainWindow *MainWindow)
182 {272 {
273<<<<<<< TREE
183 MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));274 MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
184 actionSavePrint->setText(QApplication::translate("MainWindow", "Save/Print", 0, QApplication::UnicodeUTF8));275 actionSavePrint->setText(QApplication::translate("MainWindow", "Save/Print", 0, QApplication::UnicodeUTF8));
276=======
277 MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Randy", 0, QApplication::UnicodeUTF8));
278 actionPrint->setText(QApplication::translate("MainWindow", "Print", 0, QApplication::UnicodeUTF8));
279>>>>>>> MERGE-SOURCE
185 actionRegenerate_PasswordCard->setText(QApplication::translate("MainWindow", "Regenerate PasswordCard", 0, QApplication::UnicodeUTF8));280 actionRegenerate_PasswordCard->setText(QApplication::translate("MainWindow", "Regenerate PasswordCard", 0, QApplication::UnicodeUTF8));
186 keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));281<<<<<<< TREE
187 symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));282 keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));
283 symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));
284=======
285 actionSave->setText(QApplication::translate("MainWindow", "Save", 0, QApplication::UnicodeUTF8));
286 keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));
287 symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));
288>>>>>>> MERGE-SOURCE
188 QTableWidgetItem *___qtablewidgetitem = tableWidget->horizontalHeaderItem(0);289 QTableWidgetItem *___qtablewidgetitem = tableWidget->horizontalHeaderItem(0);
189 ___qtablewidgetitem->setText(QApplication::translate("MainWindow", "A", 0, QApplication::UnicodeUTF8));290 ___qtablewidgetitem->setText(QApplication::translate("MainWindow", "A", 0, QApplication::UnicodeUTF8));
190 QTableWidgetItem *___qtablewidgetitem1 = tableWidget->horizontalHeaderItem(1);291 QTableWidgetItem *___qtablewidgetitem1 = tableWidget->horizontalHeaderItem(1);

Subscribers

People subscribed via source and target branches