Mercurial > trustbridge
changeset 524:a097dd86cb4d
merged.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Tue, 29 Apr 2014 15:26:43 +0200 |
| parents | ca583ffe728a (diff) fd29ab9cadaf (current diff) |
| children | 3edbe1af2c85 |
| files | ui/createcertlistdialog.cpp ui/mainwindow.cpp |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/createcertlistdialog.cpp Tue Apr 29 15:06:47 2014 +0200 +++ b/ui/createcertlistdialog.cpp Tue Apr 29 15:26:43 2014 +0200 @@ -62,8 +62,8 @@ headerLayout->addWidget(headerSeparator); headerLayout->insertSpacing(3, 10); - QLabel *certLabel = new QLabel("Select signing key:"); - QLabel *saveLabel = new QLabel("Select output folder:"); + QLabel *certLabel = new QLabel(tr("Select signing key:")); + QLabel *saveLabel = new QLabel(tr("Select output folder:")); labelLayout->addWidget(certLabel); labelLayout->addWidget(saveLabel);
--- a/ui/mainwindow.cpp Tue Apr 29 15:06:47 2014 +0200 +++ b/ui/mainwindow.cpp Tue Apr 29 15:26:43 2014 +0200 @@ -318,16 +318,16 @@ QMenu *mMenu = new QMenu(tr("Menu"), mMenuBar); mMenuBar->addMenu(mMenu); QAction *update = mMenu->addAction(tr("Force Update")); - QAction *settings = mMenu->addAction(tr("Settings")); - QAction *status = mMenu->addAction(tr("Statusdialog")); +// QAction *settings = mMenu->addAction(tr("Settings")); +// QAction *status = mMenu->addAction(tr("Statusdialog")); mMenu->addSeparator(); QAction *help = mMenu->addAction(tr("Help")); QAction *about = mMenu->addAction(tr("About")); mMenu->addSeparator(); QAction *quit = mMenu->addAction(tr("Quit")); connect(update, SIGNAL(triggered()), this, SLOT(checkUpdates())); - connect(settings, SIGNAL(triggered()), this, SLOT(showSettings())); - connect(status, SIGNAL(triggered()), this, SLOT(showStatus())); +// connect(settings, SIGNAL(triggered()), this, SLOT(showSettings())); +// connect(status, SIGNAL(triggered()), this, SLOT(showStatus())); connect(help, SIGNAL(triggered()), this, SLOT(showHelp())); connect(about, SIGNAL(triggered()), this, SLOT(showAbout())); connect(quit, SIGNAL(triggered()), this, SLOT(closeApp()));