comparison ui/mainwindow.cpp @ 706:6bb3018b966d

Merged
author Sascha Wilde <wilde@intevation.de>
date Wed, 02 Jul 2014 11:57:32 +0200
parents 2c63bb63de76
children bd48fae793b6
comparison
equal deleted inserted replaced
705:ff2efc1cb8fa 706:6bb3018b966d
546 updatesHeaderTextLayout->addWidget(mLastCertUpdate); 546 updatesHeaderTextLayout->addWidget(mLastCertUpdate);
547 updatesHeaderTextLayout->addWidget(mLastSWupdate); 547 updatesHeaderTextLayout->addWidget(mLastSWupdate);
548 updatesHeaderTextLayout->addSpacing(10); 548 updatesHeaderTextLayout->addSpacing(10);
549 updatesHeaderTextLayout->addWidget(updatesTip); 549 updatesHeaderTextLayout->addWidget(updatesTip);
550 550
551 QPushButton *searchUpdates = new QPushButton(tr("Check for updates")); 551 QPushButton *searchUpdates = new QPushButton(" " + tr("Check for updates"));
552 searchUpdates->setIcon(QIcon(":/img/edit-find.png")); 552 searchUpdates->setIcon(QIcon(":/img/edit-find.png"));
553 mQuitButton = new QPushButton(tr("Quit without saving")); 553 mQuitButton = new QPushButton(" " + tr("Quit without saving"));
554 mQuitButton->setIcon(QIcon(":/img/application-exit.png")); 554 mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
555 QPushButton *installButton = new QPushButton(tr("Apply changes")); 555 QPushButton *installButton = new QPushButton(" " + tr("Apply changes"));
556 #ifdef Q_OS_WIN 556 #ifdef Q_OS_WIN
557 if (is_admin()) { 557 if (is_admin()) {
558 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield); 558 QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
559 installButton->setIcon(uacShield); 559 installButton->setIcon(uacShield);
560 } 560 }
623 mUpdatesDetailsManual = new QPushButton(tr("Show details")); 623 mUpdatesDetailsManual = new QPushButton(tr("Show details"));
624 connect(mUpdatesDetailsManual, 624 connect(mUpdatesDetailsManual,
625 SIGNAL(clicked()), 625 SIGNAL(clicked()),
626 this, 626 this,
627 SLOT(toggleUpdatesManual())); 627 SLOT(toggleUpdatesManual()));
628 mUpdatesDetailsManual->hide();
629 mUpdatesManualCertificates->hide();
628 updatesManualLayout->addWidget(mUpdatesManualCertificates); 630 updatesManualLayout->addWidget(mUpdatesManualCertificates);
629 updatesManualLayout->addWidget(mUpdatesDetailsManual); 631 updatesManualLayout->addWidget(mUpdatesDetailsManual);
630 updatesManualLayout->insertStretch(2, 10); 632 updatesManualLayout->insertStretch(2, 10);
631 mUpdatesManual = new CertificateListWidget(this); 633 mUpdatesManual = new CertificateListWidget(this);
632 mUpdatesManual->hide(); 634 mUpdatesManual->hide();
813 void MainWindow::listChanged(int selected) 815 void MainWindow::listChanged(int selected)
814 { 816 {
815 int totalCount = mUpdatesRemove->selectedCertCount() + 817 int totalCount = mUpdatesRemove->selectedCertCount() +
816 mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size(); 818 mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size();
817 819
820 if (mUpdatesManual->certificates().size()) {
821 mUpdatesDetailsManual->show();
822 mUpdatesManualCertificates->show();
823 } else {
824 mUpdatesDetailsManual->hide();
825 mUpdatesManualCertificates->hide();
826 }
827
818 if (!totalCount) { 828 if (!totalCount) {
819 /* No changes */ 829 /* No changes */
820 mQuitButton->setText(tr("Quit")); 830 mQuitButton->setText(" " + tr("Quit"));
821 mUpdatesHeader->setText("<h2>" + tr("Certificates unchanged") + 831 mUpdatesHeader->setText("<h2>" + tr("Certificates unchanged") +
822 "</h2>"); 832 "</h2>");
823 } else { 833 } else {
824 mQuitButton->setText(tr("Quit without saving")); 834 mQuitButton->setText(" " + tr("Quit without saving"));
825 mUpdatesHeader->setText("<h2>" + tr("Changes (%1)") 835 mUpdatesHeader->setText("<h2>" + tr("Changes (%1)")
826 .arg(totalCount) + 836 .arg(totalCount) +
827 "</h2>"); 837 "</h2>");
828 } 838 }
829 839

http://wald.intevation.org/projects/trustbridge/