hush
/
SilentDragon
9
1
Fork 7
Code Issues 75 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

Menu shortcuts

recurring
adityapk00 6 years ago
parent
f180612150
commit
126d2e84a5
4 changed files with 45 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/mainwindow.h
  2. 33
      src/mainwindow.ui
  3. 45
      src/ui_mainwindow.h
  4. 2
      zec-qt-wallet.pro

4
src/mainwindow.h
View File

@ -57,8 +57,8 @@ private:
void removeExtraAddresses(); void removeExtraAddresses();
void setDefaultPayFrom(); void setDefaultPayFrom();
Tx createTxFromSendPage(); Tx createTxFromSendPage();
bool confirmTx(Tx tx, ToFields devFee); bool confirmTx(Tx tx, ToFields devFee);
void turnstileDoMigration(QString fromAddr = ""); void turnstileDoMigration(QString fromAddr = "");
void turnstileProgress(); void turnstileProgress();

33
src/mainwindow.ui
View File

@ -22,7 +22,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>3</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -316,8 +316,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>841</width> <width>849</width>
<height>321</height> <height>369</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="sendToLayout"> <layout class="QVBoxLayout" name="sendToLayout">
@ -718,12 +718,12 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>889</width> <width>889</width>
<height>22</height> <height>19</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuBalance"> <widget class="QMenu" name="menuFile">
<property name="title"> <property name="title">
<string>File</string> <string>&amp;File</string>
</property> </property>
<addaction name="actionImport_Private_Key"/> <addaction name="actionImport_Private_Key"/>
<addaction name="actionTurnstile_Migration"/> <addaction name="actionTurnstile_Migration"/>
@ -733,49 +733,52 @@
</widget> </widget>
<widget class="QMenu" name="menuHelp"> <widget class="QMenu" name="menuHelp">
<property name="title"> <property name="title">
<string>Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="actionDonate"/> <addaction name="actionDonate"/>
<addaction name="actionCheck_for_Updates"/> <addaction name="actionCheck_for_Updates"/>
<addaction name="actionAbout"/> <addaction name="actionAbout"/>
</widget> </widget>
<addaction name="menuBalance"/> <addaction name="menuFile"/>
<addaction name="menuHelp"/> <addaction name="menuHelp"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/> <widget class="QStatusBar" name="statusBar"/>
<action name="actionExit"> <action name="actionExit">
<property name="text"> <property name="text">
<string>Exit</string> <string>E&amp;xit</string>
</property> </property>
</action> </action>
<action name="actionAbout"> <action name="actionAbout">
<property name="text"> <property name="text">
<string>About</string> <string>&amp;About</string>
</property> </property>
</action> </action>
<action name="actionSettings"> <action name="actionSettings">
<property name="text"> <property name="text">
<string>Settings</string> <string>&amp;Settings</string>
</property>
<property name="shortcut">
<string>Ctrl+P</string>
</property> </property>
</action> </action>
<action name="actionDonate"> <action name="actionDonate">
<property name="text"> <property name="text">
<string>Donate</string> <string>&amp;Donate</string>
</property> </property>
</action> </action>
<action name="actionCheck_for_Updates"> <action name="actionCheck_for_Updates">
<property name="text"> <property name="text">
<string>Check github.com for Updates</string> <string>Check github.com for &amp;Updates</string>
</property> </property>
</action> </action>
<action name="actionTurnstile_Migration"> <action name="actionTurnstile_Migration">
<property name="text"> <property name="text">
<string>Sapling Turnstile</string> <string>Sapling &amp;Turnstile</string>
</property> </property>
</action> </action>
<action name="actionImport_Private_Key"> <action name="actionImport_Private_Key">
<property name="text"> <property name="text">
<string>Import Private Key</string> <string>&amp;Import Private Key</string>
</property> </property>
</action> </action>
</widget> </widget>

45
src/ui_mainwindow.h
View File

@ -135,7 +135,7 @@ public:
QVBoxLayout *verticalLayout_2; QVBoxLayout *verticalLayout_2;
QTableView *transactionsTable; QTableView *transactionsTable;
QMenuBar *menuBar; QMenuBar *menuBar;
QMenu *menuBalance; QMenu *menuFile;
QMenu *menuHelp; QMenu *menuHelp;
QStatusBar *statusBar; QStatusBar *statusBar;
@ -367,7 +367,7 @@ public:
sendToScrollArea->setWidgetResizable(true); sendToScrollArea->setWidgetResizable(true);
sendToWidgets = new QWidget(); sendToWidgets = new QWidget();
sendToWidgets->setObjectName(QStringLiteral("sendToWidgets")); sendToWidgets->setObjectName(QStringLiteral("sendToWidgets"));
sendToWidgets->setGeometry(QRect(0, 0, 841, 321)); sendToWidgets->setGeometry(QRect(0, 0, 849, 369));
sendToLayout = new QVBoxLayout(sendToWidgets); sendToLayout = new QVBoxLayout(sendToWidgets);
sendToLayout->setSpacing(6); sendToLayout->setSpacing(6);
sendToLayout->setContentsMargins(11, 11, 11, 11); sendToLayout->setContentsMargins(11, 11, 11, 11);
@ -641,9 +641,9 @@ public:
MainWindow->setCentralWidget(centralWidget); MainWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainWindow); menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QStringLiteral("menuBar")); menuBar->setObjectName(QStringLiteral("menuBar"));
menuBar->setGeometry(QRect(0, 0, 889, 22)); menuBar->setGeometry(QRect(0, 0, 889, 19));
menuBalance = new QMenu(menuBar); menuFile = new QMenu(menuBar);
menuBalance->setObjectName(QStringLiteral("menuBalance")); menuFile->setObjectName(QStringLiteral("menuFile"));
menuHelp = new QMenu(menuBar); menuHelp = new QMenu(menuBar);
menuHelp->setObjectName(QStringLiteral("menuHelp")); menuHelp->setObjectName(QStringLiteral("menuHelp"));
MainWindow->setMenuBar(menuBar); MainWindow->setMenuBar(menuBar);
@ -667,20 +667,20 @@ public:
QWidget::setTabOrder(btnRecieveNewAddr, txtRecieve); QWidget::setTabOrder(btnRecieveNewAddr, txtRecieve);
QWidget::setTabOrder(txtRecieve, transactionsTable); QWidget::setTabOrder(txtRecieve, transactionsTable);
menuBar->addAction(menuBalance->menuAction()); menuBar->addAction(menuFile->menuAction());
menuBar->addAction(menuHelp->menuAction()); menuBar->addAction(menuHelp->menuAction());
menuBalance->addAction(actionImport_Private_Key); menuFile->addAction(actionImport_Private_Key);
menuBalance->addAction(actionTurnstile_Migration); menuFile->addAction(actionTurnstile_Migration);
menuBalance->addAction(actionSettings); menuFile->addAction(actionSettings);
menuBalance->addSeparator(); menuFile->addSeparator();
menuBalance->addAction(actionExit); menuFile->addAction(actionExit);
menuHelp->addAction(actionDonate); menuHelp->addAction(actionDonate);
menuHelp->addAction(actionCheck_for_Updates); menuHelp->addAction(actionCheck_for_Updates);
menuHelp->addAction(actionAbout); menuHelp->addAction(actionAbout);
retranslateUi(MainWindow); retranslateUi(MainWindow);
tabWidget->setCurrentIndex(0); tabWidget->setCurrentIndex(3);
QMetaObject::connectSlotsByName(MainWindow); QMetaObject::connectSlotsByName(MainWindow);
@ -689,13 +689,16 @@ public:
void retranslateUi(QMainWindow *MainWindow) void retranslateUi(QMainWindow *MainWindow)
{ {
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zec-qt-wallet", nullptr)); MainWindow->setWindowTitle(QApplication::translate("MainWindow", "zec-qt-wallet", nullptr));
actionExit->setText(QApplication::translate("MainWindow", "Exit", nullptr)); actionExit->setText(QApplication::translate("MainWindow", "E&xit", nullptr));
actionAbout->setText(QApplication::translate("MainWindow", "About", nullptr)); actionAbout->setText(QApplication::translate("MainWindow", "&About", nullptr));
actionSettings->setText(QApplication::translate("MainWindow", "Settings", nullptr)); actionSettings->setText(QApplication::translate("MainWindow", "&Settings", nullptr));
actionDonate->setText(QApplication::translate("MainWindow", "Donate", nullptr)); #ifndef QT_NO_SHORTCUT
actionCheck_for_Updates->setText(QApplication::translate("MainWindow", "Check github.com for Updates", nullptr)); actionSettings->setShortcut(QApplication::translate("MainWindow", "Ctrl+P", nullptr));
actionTurnstile_Migration->setText(QApplication::translate("MainWindow", "Sapling Turnstile", nullptr)); #endif // QT_NO_SHORTCUT
actionImport_Private_Key->setText(QApplication::translate("MainWindow", "Import Private Key", nullptr)); actionDonate->setText(QApplication::translate("MainWindow", "&Donate", nullptr));
actionCheck_for_Updates->setText(QApplication::translate("MainWindow", "Check github.com for &Updates", nullptr));
actionTurnstile_Migration->setText(QApplication::translate("MainWindow", "Sapling &Turnstile", nullptr));
actionImport_Private_Key->setText(QApplication::translate("MainWindow", "&Import Private Key", nullptr));
groupBox->setTitle(QApplication::translate("MainWindow", "Summary", nullptr)); groupBox->setTitle(QApplication::translate("MainWindow", "Summary", nullptr));
label->setText(QApplication::translate("MainWindow", "Shielded", nullptr)); label->setText(QApplication::translate("MainWindow", "Shielded", nullptr));
balSheilded->setText(QString()); balSheilded->setText(QString());
@ -740,8 +743,8 @@ public:
qrcodeDisplay->setText(QString()); qrcodeDisplay->setText(QString());
tabWidget->setTabText(tabWidget->indexOf(tab_3), QApplication::translate("MainWindow", "Receive", nullptr)); tabWidget->setTabText(tabWidget->indexOf(tab_3), QApplication::translate("MainWindow", "Receive", nullptr));
tabWidget->setTabText(tabWidget->indexOf(tab_4), QApplication::translate("MainWindow", "Transactions", nullptr)); tabWidget->setTabText(tabWidget->indexOf(tab_4), QApplication::translate("MainWindow", "Transactions", nullptr));
menuBalance->setTitle(QApplication::translate("MainWindow", "File", nullptr)); menuFile->setTitle(QApplication::translate("MainWindow", "&File", nullptr));
menuHelp->setTitle(QApplication::translate("MainWindow", "Help", nullptr)); menuHelp->setTitle(QApplication::translate("MainWindow", "&Help", nullptr));
} // retranslateUi } // retranslateUi
}; };

2
zec-qt-wallet.pro
View File

@ -76,7 +76,7 @@ FORMS += \
src/confirm.ui \ src/confirm.ui \
src/turnstile.ui \ src/turnstile.ui \
src/turnstileprogress.ui \ src/turnstileprogress.ui \
src/privkey.ui src/privkey.ui \
src/memodialog.ui src/memodialog.ui
# Default rules for deployment. # Default rules for deployment.

Write Preview
Loading…
Cancel
Save