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
1=== modified file 'mainwindow.cpp'
2--- mainwindow.cpp 2011-03-21 18:37:01 +0000
3+++ mainwindow.cpp 2011-03-26 06:06:39 +0000
4@@ -3,12 +3,20 @@
5 MainWindow::MainWindow(QWidget *parent) :
6 QMainWindow(parent),
7 ui(new Ui :: MainWindow)
8+<<<<<<< TREE
9 {
10 qsrand(time(0));
11 ui -> setupUi(this);
12 setTable("");
13 //connect(ui -> actionRegenerate_PasswordCard, SIGNAL(triggered()), this, SLOT(on_regenerate_PasswordCard_triggered()));
14 }
15+=======
16+ {
17+ qsrand(time(0));
18+ ui -> setupUi(this);
19+ setTable("");
20+ }
21+>>>>>>> MERGE-SOURCE
22
23 MainWindow::~MainWindow()
24 {
25@@ -161,8 +169,12 @@
26 {
27 key[i] = keyString[i];
28 }
29+<<<<<<< TREE
30 //ui->lineEdit->setText(QApplication::translate("MainWindow", key, 0, QApplication::UnicodeUTF8));
31+=======
32+>>>>>>> MERGE-SOURCE
33 setTable(key);
34+<<<<<<< TREE
35
36 QMessageBox msgBox;
37 char *msg = (char*)malloc(200*sizeof(char));
38@@ -226,3 +238,68 @@
39 msgBox.exec();
40 }
41 }
42+=======
43+ ui->keyLineEdit->setText(QApplication::translate("MainWindow", key, 0, QApplication::UnicodeUTF8));
44+
45+ QMessageBox msgBox;
46+ char *msg = (char*)malloc(200*sizeof(char));
47+ strcpy(msg, "Please save your key : ");
48+ strcat(msg, key);
49+ msgBox.setText(msg);
50+ msgBox.exec();
51+}
52+
53+void MainWindow::on_actionSave_triggered()
54+{
55+ QRect r1(0, 0, 470, 265);
56+
57+ QImage image(r1.size(), QImage::Format_ARGB32_Premultiplied);
58+ ui->tableWidget->render(&image, r1.topLeft(), r1, QWidget::DrawWindowBackground | QWidget::DrawChildren);
59+ QPrinter printer;
60+ QPrintDialog printDialog(&printer, this);
61+ if (printDialog.exec()) {
62+ QPainter painter(&printer);
63+ painter.setViewport(0, 0,470, 265);
64+ painter.setWindow(r1);
65+ painter.drawImage(0, 0, image);
66+ }
67+}
68+
69+void MainWindow::on_actionRegenerate_PasswordCard_triggered()
70+{
71+ bool ok;
72+ QString text = QInputDialog::getText(this, tr("QInputDialog::getText()"),
73+ tr("Regeneration Key:"), QLineEdit::Normal,
74+ NULL, &ok);
75+
76+ if ( ok && !text.isEmpty() )
77+ {
78+ //Message Box for wrong formatted regenerateKey string
79+ QMessageBox msgBox;
80+ char *msg = (char*)malloc(100*sizeof(char));
81+ strcpy(msg, "Wrong format, Please enter 16 Hex digits in capital ");
82+
83+ QString regenerateKey = text;
84+
85+ /*Regular Expreesion to check whether string is HEX & in
86+ captial letters*/
87+ QRegExp rx("[0-9A-F]{1,16}");
88+
89+ // Checks regenerateKey to be a 16 HEX digits in CAPS
90+ if((regenerateKey.length()==16) && (rx.exactMatch(regenerateKey) ))
91+ setTable(regenerateKey.toStdString());
92+ else
93+ {
94+ msgBox.setText(msg);
95+ msgBox.exec();
96+ }
97+ }
98+ else
99+ {
100+ QMessageBox msgBox;
101+ char *msg = (char*)malloc(100*sizeof(char));
102+ strcpy(msg, "Enter Regeneration key.");
103+ msgBox.setText(msg);
104+ msgBox.exec();
105+ }
106+}>>>>>>> MERGE-SOURCE
107
108=== modified file 'mainwindow.h'
109--- mainwindow.h 2011-03-21 18:37:01 +0000
110+++ mainwindow.h 2011-03-26 06:06:39 +0000
111@@ -19,8 +19,15 @@
112 #include "ui_mainwindow.h"
113 #include "md5.h"
114 #include "randyUtil.h"
115-#include <QPrintDialog>
116-#include <QPainter>
117+<<<<<<< TREE
118+#include <QPrintDialog>
119+#include <QPainter>
120+=======
121+#include <QPrintDialog>
122+#include <QPrinter>
123+#include <QPainter>
124+#include <QPrintDialog>
125+>>>>>>> MERGE-SOURCE
126
127
128 namespace Ui {
129@@ -56,9 +63,17 @@
130
131
132 private slots:
133+<<<<<<< TREE
134 void on_actionSavePrint_triggered();
135+=======
136+ void on_actionRegenerate_PasswordCard_triggered();
137+ void on_actionSave_triggered();
138+>>>>>>> MERGE-SOURCE
139 void on_pb_Generate_clicked();
140+<<<<<<< TREE
141 void on_actionRegenerate_PasswordCard_triggered();
142+=======
143+>>>>>>> MERGE-SOURCE
144 };
145
146 #endif // MAINWINDOW_H
147
148=== modified file 'mainwindow.ui'
149--- mainwindow.ui 2011-03-21 18:37:01 +0000
150+++ mainwindow.ui 2011-03-26 06:06:39 +0000
151@@ -11,9 +11,10 @@
152 </rect>
153 </property>
154 <property name="windowTitle">
155- <string>MainWindow</string>
156+ <string>Randy</string>
157 </property>
158 <widget class="QWidget" name="centralWidget">
159+<<<<<<< TREE
160 <layout class="QVBoxLayout" name="verticalLayout">
161 <item>
162 <layout class="QHBoxLayout" name="horizontalLayout">
163@@ -205,6 +206,234 @@
164 </layout>
165 </item>
166 </layout>
167+=======
168+ <layout class="QVBoxLayout" name="verticalLayout">
169+ <item>
170+ <layout class="QHBoxLayout" name="horizontalLayout_2">
171+ <property name="leftMargin">
172+ <number>3</number>
173+ </property>
174+ <property name="rightMargin">
175+ <number>3</number>
176+ </property>
177+ <property name="bottomMargin">
178+ <number>0</number>
179+ </property>
180+ <item>
181+ <widget class="QLabel" name="keyGenerateLabel">
182+ <property name="text">
183+ <string>Password card Key</string>
184+ </property>
185+ </widget>
186+ </item>
187+ <item>
188+ <spacer name="horizontalSpacer_2">
189+ <property name="orientation">
190+ <enum>Qt::Horizontal</enum>
191+ </property>
192+ <property name="sizeHint" stdset="0">
193+ <size>
194+ <width>40</width>
195+ <height>20</height>
196+ </size>
197+ </property>
198+ </spacer>
199+ </item>
200+ <item>
201+ <widget class="QLineEdit" name="keyLineEdit">
202+ <property name="readOnly">
203+ <bool>true</bool>
204+ </property>
205+ </widget>
206+ </item>
207+ <item>
208+ <spacer name="horizontalSpacer">
209+ <property name="orientation">
210+ <enum>Qt::Horizontal</enum>
211+ </property>
212+ <property name="sizeHint" stdset="0">
213+ <size>
214+ <width>40</width>
215+ <height>20</height>
216+ </size>
217+ </property>
218+ </spacer>
219+ </item>
220+ <item>
221+ <widget class="QCheckBox" name="symbols">
222+ <property name="text">
223+ <string>Use Symbols</string>
224+ </property>
225+ </widget>
226+ </item>
227+ </layout>
228+ </item>
229+ <item>
230+ <widget class="QTableWidget" name="tableWidget">
231+ <property name="enabled">
232+ <bool>false</bool>
233+ </property>
234+ <property name="whatsThis">
235+ <string/>
236+ </property>
237+ <property name="selectionMode">
238+ <enum>QAbstractItemView::NoSelection</enum>
239+ </property>
240+ <attribute name="horizontalHeaderDefaultSectionSize">
241+ <number>30</number>
242+ </attribute>
243+ <attribute name="horizontalHeaderMinimumSectionSize">
244+ <number>30</number>
245+ </attribute>
246+ <row>
247+ <property name="text">
248+ <string>1</string>
249+ </property>
250+ </row>
251+ <row>
252+ <property name="text">
253+ <string>2</string>
254+ </property>
255+ </row>
256+ <row>
257+ <property name="text">
258+ <string>3</string>
259+ </property>
260+ </row>
261+ <row>
262+ <property name="text">
263+ <string>4</string>
264+ </property>
265+ </row>
266+ <row>
267+ <property name="text">
268+ <string>5</string>
269+ </property>
270+ </row>
271+ <row>
272+ <property name="text">
273+ <string>6</string>
274+ </property>
275+ </row>
276+ <row>
277+ <property name="text">
278+ <string>7</string>
279+ </property>
280+ </row>
281+ <row>
282+ <property name="text">
283+ <string>8</string>
284+ </property>
285+ </row>
286+ <column>
287+ <property name="text">
288+ <string>A</string>
289+ </property>
290+ </column>
291+ <column>
292+ <property name="text">
293+ <string>B</string>
294+ </property>
295+ </column>
296+ <column>
297+ <property name="text">
298+ <string>C</string>
299+ </property>
300+ </column>
301+ <column>
302+ <property name="text">
303+ <string>D</string>
304+ </property>
305+ </column>
306+ <column>
307+ <property name="text">
308+ <string>E</string>
309+ </property>
310+ </column>
311+ <column>
312+ <property name="text">
313+ <string>F</string>
314+ </property>
315+ </column>
316+ <column>
317+ <property name="text">
318+ <string>G</string>
319+ </property>
320+ </column>
321+ <column>
322+ <property name="text">
323+ <string>H</string>
324+ </property>
325+ </column>
326+ <column>
327+ <property name="text">
328+ <string>I</string>
329+ </property>
330+ </column>
331+ <column>
332+ <property name="text">
333+ <string>J</string>
334+ </property>
335+ </column>
336+ <column>
337+ <property name="text">
338+ <string>K</string>
339+ </property>
340+ </column>
341+ <column>
342+ <property name="text">
343+ <string>L</string>
344+ </property>
345+ </column>
346+ <column>
347+ <property name="text">
348+ <string>M</string>
349+ </property>
350+ </column>
351+ <column>
352+ <property name="text">
353+ <string>N</string>
354+ </property>
355+ </column>
356+ <column>
357+ <property name="text">
358+ <string>O</string>
359+ </property>
360+ </column>
361+ </widget>
362+ </item>
363+ <item>
364+ <layout class="QHBoxLayout" name="horizontalLayout">
365+ <property name="leftMargin">
366+ <number>3</number>
367+ </property>
368+ <property name="rightMargin">
369+ <number>3</number>
370+ </property>
371+ <item>
372+ <spacer name="horizontalSpacer_3">
373+ <property name="orientation">
374+ <enum>Qt::Horizontal</enum>
375+ </property>
376+ <property name="sizeHint" stdset="0">
377+ <size>
378+ <width>88</width>
379+ <height>20</height>
380+ </size>
381+ </property>
382+ </spacer>
383+ </item>
384+ <item>
385+ <widget class="QPushButton" name="pb_Generate">
386+ <property name="text">
387+ <string>Generate</string>
388+ </property>
389+ </widget>
390+ </item>
391+ </layout>
392+ </item>
393+ </layout>
394+>>>>>>> MERGE-SOURCE
395 </widget>
396 <widget class="QMenuBar" name="menuBar">
397 <property name="geometry">
398@@ -221,6 +450,7 @@
399 </property>
400 <addaction name="actionSavePrint"/>
401 <addaction name="actionRegenerate_PasswordCard"/>
402+ <addaction name="actionSave"/>
403 </widget>
404 <addaction name="menuFile"/>
405 </widget>
406@@ -235,6 +465,11 @@
407 <string>Regenerate PasswordCard</string>
408 </property>
409 </action>
410+ <action name="actionSave">
411+ <property name="text">
412+ <string>Save</string>
413+ </property>
414+ </action>
415 </widget>
416 <layoutdefault spacing="6" margin="11"/>
417 <resources/>
418
419=== modified file 'moc_mainwindow.cpp'
420--- moc_mainwindow.cpp 2011-03-21 18:37:01 +0000
421+++ moc_mainwindow.cpp 2011-03-26 06:06:39 +0000
422@@ -1,7 +1,11 @@
423 /****************************************************************************
424 ** Meta object code from reading C++ file 'mainwindow.h'
425 **
426+<<<<<<< TREE
427 ** Created: Mon Mar 14 14:35:28 2011
428+=======
429+** Created: Mon Mar 14 10:09:42 2011
430+>>>>>>> MERGE-SOURCE
431 ** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0)
432 **
433 ** WARNING! All changes made in this file will be lost!
434@@ -32,16 +36,27 @@
435
436 // slots: signature, parameters, type, tag, flags
437 12, 11, 11, 11, 0x08,
438+<<<<<<< TREE
439 43, 11, 11, 11, 0x08,
440 68, 11, 11, 11, 0x08,
441+=======
442+ 57, 11, 11, 11, 0x08,
443+ 83, 11, 11, 11, 0x08,
444+>>>>>>> MERGE-SOURCE
445
446 0 // eod
447 };
448
449 static const char qt_meta_stringdata_MainWindow[] = {
450+<<<<<<< TREE
451 "MainWindow\0\0on_actionSavePrint_triggered()\0"
452 "on_pb_Generate_clicked()\0"
453 "on_actionRegenerate_PasswordCard_triggered()\0"
454+=======
455+ "MainWindow\0\0on_actionRegenerate_PasswordCard_triggered()\0"
456+ "on_actionSave_triggered()\0"
457+ "on_pb_Generate_clicked()\0"
458+>>>>>>> MERGE-SOURCE
459 };
460
461 const QMetaObject MainWindow::staticMetaObject = {
462@@ -73,9 +88,15 @@
463 return _id;
464 if (_c == QMetaObject::InvokeMetaMethod) {
465 switch (_id) {
466+<<<<<<< TREE
467 case 0: on_actionSavePrint_triggered(); break;
468 case 1: on_pb_Generate_clicked(); break;
469 case 2: on_actionRegenerate_PasswordCard_triggered(); break;
470+=======
471+ case 0: on_actionRegenerate_PasswordCard_triggered(); break;
472+ case 1: on_actionSave_triggered(); break;
473+ case 2: on_pb_Generate_clicked(); break;
474+>>>>>>> MERGE-SOURCE
475 default: ;
476 }
477 _id -= 3;
478
479=== modified file 'randy'
480Binary files randy 2011-03-11 19:45:29 +0000 and randy 2011-03-26 06:06:39 +0000 differ
481=== modified file 'ui_mainwindow.h'
482--- ui_mainwindow.h 2011-03-21 18:37:01 +0000
483+++ ui_mainwindow.h 2011-03-26 06:06:39 +0000
484@@ -1,7 +1,11 @@
485 /********************************************************************************
486 ** Form generated from reading UI file 'mainwindow.ui'
487 **
488+<<<<<<< TREE
489 ** Created: Mon Mar 14 14:35:20 2011
490+=======
491+** Created: Mon Mar 14 10:09:39 2011
492+>>>>>>> MERGE-SOURCE
493 ** by: Qt User Interface Compiler version 4.7.0
494 **
495 ** WARNING! All changes made in this file will be lost when recompiling UI file!
496@@ -35,15 +39,31 @@
497 public:
498 QAction *actionSavePrint;
499 QAction *actionRegenerate_PasswordCard;
500+ QAction *actionSave;
501 QWidget *centralWidget;
502+<<<<<<< TREE
503 QVBoxLayout *verticalLayout;
504 QHBoxLayout *horizontalLayout;
505 QLabel *keyGenerateLabel;
506 QSpacerItem *horizontalSpacer;
507 QCheckBox *symbols;
508+=======
509+ QVBoxLayout *verticalLayout;
510+ QHBoxLayout *horizontalLayout_2;
511+ QLabel *keyGenerateLabel;
512+ QSpacerItem *horizontalSpacer_2;
513+ QLineEdit *keyLineEdit;
514+ QSpacerItem *horizontalSpacer;
515+ QCheckBox *symbols;
516+>>>>>>> MERGE-SOURCE
517 QTableWidget *tableWidget;
518+<<<<<<< TREE
519 QHBoxLayout *horizontalLayout_2;
520 QSpacerItem *horizontalSpacer_2;
521+=======
522+ QHBoxLayout *horizontalLayout;
523+ QSpacerItem *horizontalSpacer_3;
524+>>>>>>> MERGE-SOURCE
525 QPushButton *pb_Generate;
526 QMenuBar *menuBar;
527 QMenu *menuFile;
528@@ -53,13 +73,22 @@
529 {
530 if (MainWindow->objectName().isEmpty())
531 MainWindow->setObjectName(QString::fromUtf8("MainWindow"));
532+<<<<<<< TREE
533 MainWindow->resize(492, 402);
534 actionSavePrint = new QAction(MainWindow);
535 actionSavePrint->setObjectName(QString::fromUtf8("actionSavePrint"));
536+=======
537+ MainWindow->resize(492, 402);
538+ actionPrint = new QAction(MainWindow);
539+ actionPrint->setObjectName(QString::fromUtf8("actionPrint"));
540+>>>>>>> MERGE-SOURCE
541 actionRegenerate_PasswordCard = new QAction(MainWindow);
542 actionRegenerate_PasswordCard->setObjectName(QString::fromUtf8("actionRegenerate_PasswordCard"));
543+ actionSave = new QAction(MainWindow);
544+ actionSave->setObjectName(QString::fromUtf8("actionSave"));
545 centralWidget = new QWidget(MainWindow);
546 centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
547+<<<<<<< TREE
548 verticalLayout = new QVBoxLayout(centralWidget);
549 verticalLayout->setSpacing(6);
550 verticalLayout->setContentsMargins(11, 11, 11, 11);
551@@ -84,6 +113,43 @@
552
553 verticalLayout->addLayout(horizontalLayout);
554
555+=======
556+ verticalLayout = new QVBoxLayout(centralWidget);
557+ verticalLayout->setSpacing(6);
558+ verticalLayout->setContentsMargins(11, 11, 11, 11);
559+ verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
560+ horizontalLayout_2 = new QHBoxLayout();
561+ horizontalLayout_2->setSpacing(6);
562+ horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
563+ horizontalLayout_2->setContentsMargins(3, -1, 3, 0);
564+ keyGenerateLabel = new QLabel(centralWidget);
565+ keyGenerateLabel->setObjectName(QString::fromUtf8("keyGenerateLabel"));
566+
567+ horizontalLayout_2->addWidget(keyGenerateLabel);
568+
569+ horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
570+
571+ horizontalLayout_2->addItem(horizontalSpacer_2);
572+
573+ keyLineEdit = new QLineEdit(centralWidget);
574+ keyLineEdit->setObjectName(QString::fromUtf8("keyLineEdit"));
575+ keyLineEdit->setReadOnly(true);
576+
577+ horizontalLayout_2->addWidget(keyLineEdit);
578+
579+ horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
580+
581+ horizontalLayout_2->addItem(horizontalSpacer);
582+
583+ symbols = new QCheckBox(centralWidget);
584+ symbols->setObjectName(QString::fromUtf8("symbols"));
585+
586+ horizontalLayout_2->addWidget(symbols);
587+
588+
589+ verticalLayout->addLayout(horizontalLayout_2);
590+
591+>>>>>>> MERGE-SOURCE
592 tableWidget = new QTableWidget(centralWidget);
593 if (tableWidget->columnCount() < 15)
594 tableWidget->setColumnCount(15);
595@@ -140,6 +206,7 @@
596 tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
597 tableWidget->horizontalHeader()->setDefaultSectionSize(30);
598 tableWidget->horizontalHeader()->setMinimumSectionSize(30);
599+<<<<<<< TREE
600
601 verticalLayout->addWidget(tableWidget);
602
603@@ -150,14 +217,36 @@
604
605 horizontalLayout_2->addItem(horizontalSpacer_2);
606
607+=======
608+
609+ verticalLayout->addWidget(tableWidget);
610+
611+ horizontalLayout = new QHBoxLayout();
612+ horizontalLayout->setSpacing(6);
613+ horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
614+ horizontalLayout->setContentsMargins(3, -1, 3, -1);
615+ horizontalSpacer_3 = new QSpacerItem(88, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
616+
617+ horizontalLayout->addItem(horizontalSpacer_3);
618+
619+>>>>>>> MERGE-SOURCE
620 pb_Generate = new QPushButton(centralWidget);
621 pb_Generate->setObjectName(QString::fromUtf8("pb_Generate"));
622+<<<<<<< TREE
623
624 horizontalLayout_2->addWidget(pb_Generate);
625
626
627 verticalLayout->addLayout(horizontalLayout_2);
628
629+=======
630+
631+ horizontalLayout->addWidget(pb_Generate);
632+
633+
634+ verticalLayout->addLayout(horizontalLayout);
635+
636+>>>>>>> MERGE-SOURCE
637 MainWindow->setCentralWidget(centralWidget);
638 menuBar = new QMenuBar(MainWindow);
639 menuBar->setObjectName(QString::fromUtf8("menuBar"));
640@@ -172,6 +261,7 @@
641 menuBar->addAction(menuFile->menuAction());
642 menuFile->addAction(actionSavePrint);
643 menuFile->addAction(actionRegenerate_PasswordCard);
644+ menuFile->addAction(actionSave);
645
646 retranslateUi(MainWindow);
647
648@@ -180,11 +270,22 @@
649
650 void retranslateUi(QMainWindow *MainWindow)
651 {
652+<<<<<<< TREE
653 MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
654 actionSavePrint->setText(QApplication::translate("MainWindow", "Save/Print", 0, QApplication::UnicodeUTF8));
655+=======
656+ MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Randy", 0, QApplication::UnicodeUTF8));
657+ actionPrint->setText(QApplication::translate("MainWindow", "Print", 0, QApplication::UnicodeUTF8));
658+>>>>>>> MERGE-SOURCE
659 actionRegenerate_PasswordCard->setText(QApplication::translate("MainWindow", "Regenerate PasswordCard", 0, QApplication::UnicodeUTF8));
660- keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));
661- symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));
662+<<<<<<< TREE
663+ keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));
664+ symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));
665+=======
666+ actionSave->setText(QApplication::translate("MainWindow", "Save", 0, QApplication::UnicodeUTF8));
667+ keyGenerateLabel->setText(QApplication::translate("MainWindow", "Password card Key", 0, QApplication::UnicodeUTF8));
668+ symbols->setText(QApplication::translate("MainWindow", "Use Symbols", 0, QApplication::UnicodeUTF8));
669+>>>>>>> MERGE-SOURCE
670 QTableWidgetItem *___qtablewidgetitem = tableWidget->horizontalHeaderItem(0);
671 ___qtablewidgetitem->setText(QApplication::translate("MainWindow", "A", 0, QApplication::UnicodeUTF8));
672 QTableWidgetItem *___qtablewidgetitem1 = tableWidget->horizontalHeaderItem(1);

Subscribers

People subscribed via source and target branches