Skip to content

Commit

Permalink
Update page button style
Browse files Browse the repository at this point in the history 
IB-7961

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
@metsma
metsma committed Jun 7, 2024
1 parent afd3ae1 commit b996d84
Show file tree
Hide file tree
Showing 25 changed files with 409 additions and 966 deletions.
2 changes: 1 addition & 1 deletion client/CDoc2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace cdoc20 {
return true;
return dispatchToMain([] {
auto *notification = new FadeInNotification(Application::mainWindow(),
ria::qdigidoc4::colors::WHITE, ria::qdigidoc4::colors::MANTIS, 110);
ria::qdigidoc4::colors::WHITE, ria::qdigidoc4::colors::MANTIS);
notification->start(QCoreApplication::translate("MainWindow", "Check internet connection"), 750, 3000, 1200);
return false;
});
Expand Down
4 changes: 0 additions & 4 deletions client/Colors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,14 @@ namespace qdigidoc4
namespace colors
{
// Blues
static const QString ASTRONAUT_BLUE = QStringLiteral("#023664");
static const QString BAHAMA_BLUE = QStringLiteral("#035894");
static const QString CURIOUS_BLUE = QStringLiteral("#31A3D9");
static const QString DEEP_CERULEAN = QStringLiteral("#006EB5");
static const QString LOCHMARA = QStringLiteral("#008DCF");
// Reds
static const QString MOJO = QStringLiteral("#981E32");
// Whites
static const QString PORCELAIN = QStringLiteral("#f4f5f6");
static const QString WHITE = QStringLiteral("#ffffff");
// Golds-yellows
static const QString CLAY_CREEK = QStringLiteral("#998B66");
static const QString MARZIPAN = QStringLiteral("#F8DDA7");
// Green
static const QString MANTIS = QStringLiteral("#498526");
Expand Down
106 changes: 33 additions & 73 deletions client/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,9 @@ MainWindow::MainWindow( QWidget *parent )
setAcceptDrops( true );
ui->setupUi(this);

QFont version = Styles::font(Styles::Regular, 12);
version.setUnderline(true);
QFont condensed11 = Styles::font( Styles::Condensed, 11 );
QFont condensed14 = Styles::font( Styles::Condensed, 14 );
QFont regular20 = Styles::font( Styles::Regular, 20 );
ui->version->setFont(version);
ui->signIntroLabel->setFont( regular20 );
ui->signIntroButton->setFont( condensed14 );
ui->signIntroButton->setFocus();
Expand All @@ -90,17 +87,17 @@ MainWindow::MainWindow( QWidget *parent )
connect(ui->version, &QPushButton::clicked, this, [this] {showSettings(SettingsDialog::DiagnosticsSettings);});

ui->coatOfArms->load(QStringLiteral(":/images/Logo_small.svg"));
ui->signature->init( Pages::SignIntro, ui->signatureShadow, true );
ui->crypto->init( Pages::CryptoIntro, ui->cryptoShadow, false );
ui->myEid->init( Pages::MyEid, ui->myEidShadow, false );

connect(ui->signature, &PageIcon::activated, this, &MainWindow::clearPopups);
connect(ui->signature, &PageIcon::activated, this, &MainWindow::pageSelected);
connect(ui->crypto, &PageIcon::activated, this, &MainWindow::clearPopups);
connect(ui->crypto, &PageIcon::activated, this, &MainWindow::pageSelected);
connect(ui->myEid, &PageIcon::activated, this, &MainWindow::clearPopups);
connect(ui->myEid, &PageIcon::activated, this, &MainWindow::pageSelected);

ui->pageButtonGroup->setId(ui->signature, Pages::SignIntro);
ui->pageButtonGroup->setId(ui->crypto, Pages::CryptoIntro);
ui->pageButtonGroup->setId(ui->myEid, Pages::MyEid);

connect(ui->pageButtonGroup, QOverload<QAbstractButton *, bool>::of(&QButtonGroup::buttonToggled), this, &MainWindow::clearPopups);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(ui->pageButtonGroup, &QButtonGroup::idToggled, this, &MainWindow::pageSelected);
#else
connect(ui->pageButtonGroup, QOverload<QAbstractButton *, bool>::of(&QButtonGroup::buttonToggled), this,
[=](QAbstractButton *button, bool checked){ pageSelected(ui->pageButtonGroup->id(button), checked); });
#endif
ui->help->installEventFilter(new ButtonHoverFilter(QStringLiteral(":/images/icon_Abi.svg"), QStringLiteral(":/images/icon_Abi_hover.svg"), this));
ui->settings->installEventFilter(new ButtonHoverFilter(QStringLiteral(":/images/icon_Seaded.svg"), QStringLiteral(":/images/icon_Seaded_hover.svg"), this));
connect(ui->help, &QToolButton::clicked, qApp, &Application::openHelp);
Expand Down Expand Up @@ -176,39 +173,15 @@ MainWindow::~MainWindow()
delete ui;
}

void MainWindow::pageSelected(PageIcon *page)
void MainWindow::pageSelected(int page, bool checked)
{
// Stay in current view if same page icon clicked
auto current = ui->startScreen->currentIndex();
bool navigate = false;
switch(current)
{
case SignIntro:
case SignDetails:
navigate = (page->getType() != SignIntro);
break;
case CryptoIntro:
case CryptoDetails:
navigate = (page->getType() != CryptoIntro);
break;
default:
navigate = (page->getType() != current);
break;
}

Pages toPage = page->getType();
if(toPage == SignIntro && digiDoc)
{
selectPage(SignDetails);
return;
}
if(toPage == CryptoIntro && cryptoDoc)
{
selectPage(CryptoDetails);
if(!checked)
return;
}
if(navigate)
navigateToPage(toPage);
if(page == SignIntro && digiDoc)
page = SignDetails;
if(page == CryptoIntro && cryptoDoc)
page = CryptoDetails;
selectPage(Pages(page));
}

void MainWindow::adjustDrops()
Expand Down Expand Up @@ -345,7 +318,7 @@ void MainWindow::mouseReleaseEvent(QMouseEvent *event)
{
resetCryptoDoc();
resetDigiDoc();
navigateToPage(Pages::SignIntro);
selectPage(Pages::SignIntro);
}
else
QWidget::mouseReleaseEvent(event);
Expand Down Expand Up @@ -448,7 +421,7 @@ void MainWindow::onSignAction(int action, const QString &info1, const QString &i
break;
case ContainerCancel:
resetDigiDoc();
navigateToPage(Pages::SignIntro);
selectPage(Pages::SignIntro);
break;
case ContainerConvert:
if(digiDoc)
Expand Down Expand Up @@ -487,7 +460,7 @@ void MainWindow::convertToBDoc()
if(!wrap(cryptoDoc->fileName(), cryptoDoc->state() == EncryptedContainer))
return;

auto *notification = new FadeInNotification(this, WHITE, MANTIS, 110);
auto *notification = new FadeInNotification(this, WHITE, MANTIS);
notification->start( tr("Converted to signed document!"), 750, 3000, 1200 );
}

Expand Down Expand Up @@ -515,7 +488,7 @@ void MainWindow::convertToCDoc()
ui->cryptoContainerPage->transition(cryptoDoc, qApp->signer()->tokenauth().cert());
selectPage(CryptoDetails);

auto *notification = new FadeInNotification(this, WHITE, MANTIS, 110);
auto *notification = new FadeInNotification(this, WHITE, MANTIS);
notification->start( tr("Converted to crypto container!"), 750, 3000, 1200 );
}

Expand All @@ -539,7 +512,7 @@ void MainWindow::onCryptoAction(int action, const QString &/*id*/, const QString
{
case ContainerCancel:
resetCryptoDoc();
navigateToPage(Pages::CryptoIntro);
selectPage(Pages::CryptoIntro);
break;
case ContainerConvert:
if(cryptoDoc)
Expand All @@ -550,15 +523,15 @@ void MainWindow::onCryptoAction(int action, const QString &/*id*/, const QString
if(decrypt())
{
ui->cryptoContainerPage->transition(cryptoDoc, qApp->signer()->tokenauth().cert());
auto *notification = new FadeInNotification(this, WHITE, MANTIS, 110);
auto *notification = new FadeInNotification(this, WHITE, MANTIS);
notification->start( tr("Decryption succeeded!"), 750, 3000, 1200 );
}
break;
case EncryptContainer:
if(encrypt())
{
ui->cryptoContainerPage->transition(cryptoDoc, qApp->signer()->tokenauth().cert());
auto *notification = new FadeInNotification(this, WHITE, MANTIS, 110);
auto *notification = new FadeInNotification(this, WHITE, MANTIS);
notification->start( tr("Encryption succeeded!"), 750, 3000, 1200 );
}
break;
Expand Down Expand Up @@ -687,9 +660,9 @@ void MainWindow::openFiles(const QStringList &files, bool addFile, bool forceCre
void MainWindow::open(const QStringList &params, bool crypto, bool sign)
{
if (crypto && !sign)
navigateToPage(Pages::CryptoIntro);
selectPage(Pages::CryptoIntro);
else
navigateToPage(Pages::SignIntro);
selectPage(Pages::SignIntro);

QStringList files;
for(const auto &param: params)
Expand Down Expand Up @@ -756,11 +729,6 @@ void MainWindow::resetDigiDoc(DigiDoc *doc, bool warnOnChange)
digiDoc = doc;
}

void MainWindow::resizeEvent(QResizeEvent * /*event*/)
{
ui->version->move( ui->version->geometry().x(), ui->leftBar->height() - ui->version->height() - 11 );
}

bool MainWindow::save(bool saveAs)
{
if(!digiDoc)
Expand Down Expand Up @@ -820,22 +788,14 @@ QString MainWindow::selectFile( const QString &title, const QString &filename, b

void MainWindow::selectPage(Pages page)
{
selectPageIcon( page < CryptoIntro ? ui->signature : (page == MyEid ? ui->myEid : ui->crypto));
auto *btn = page < CryptoIntro ? ui->signature : (page == MyEid ? ui->myEid : ui->crypto);
btn->setChecked(true);
ui->startScreen->setCurrentIndex(page);
warnings->updateWarnings();
adjustDrops();
updateSelector();
}

void MainWindow::selectPageIcon( PageIcon* page )
{
ui->rightShadow->raise();
for(auto *pageIcon: { ui->signature, ui->crypto, ui->myEid })
{
pageIcon->activate( pageIcon == page );
}
}

void MainWindow::showCardMenu(bool show)
{
if(show)
Expand Down Expand Up @@ -893,7 +853,7 @@ void MainWindow::sign(F &&sign)
{
if(!CheckConnection().check())
{
auto *notification = new FadeInNotification(this, MOJO, MARZIPAN, 110);
auto *notification = new FadeInNotification(this, MOJO, MARZIPAN);
notification->start(tr("Check internet connection"), 750, 3000, 1200);
return;
}
Expand Down Expand Up @@ -924,7 +884,7 @@ void MainWindow::sign(F &&sign)

ui->signContainerPage->transition(digiDoc);

auto *notification = new FadeInNotification(this, WHITE, MANTIS, 110);
auto *notification = new FadeInNotification(this, WHITE, MANTIS);
notification->start(tr("The container has been successfully signed!"), 750, 3000, 1200);
adjustDrops();
}
Expand All @@ -948,7 +908,7 @@ void MainWindow::removeCryptoFile(int index)
if(QFile::exists(cryptoDoc->fileName()))
QFile::remove(cryptoDoc->fileName());
resetCryptoDoc();
navigateToPage(Pages::CryptoIntro);
selectPage(Pages::CryptoIntro);
}
}

Expand Down Expand Up @@ -1005,7 +965,7 @@ void MainWindow::removeSignatureFile(int index)
if(QFile::exists(digiDoc->fileName()))
QFile::remove(digiDoc->fileName());
resetDigiDoc(nullptr, false);
navigateToPage(Pages::SignIntro);
selectPage(Pages::SignIntro);
}
}

Expand Down
4 changes: 1 addition & 3 deletions client/MainWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private Q_SLOTS:
void changePin2Clicked( bool isForgotPin, bool isBlockedPin );
void changePukClicked();
void open(const QStringList &params, bool crypto, bool sign);
void pageSelected(PageIcon *page);
void pageSelected(int page, bool checked = true);
void warningClicked(const QString &link);

protected:
Expand All @@ -64,7 +64,6 @@ private Q_SLOTS:
void dragLeaveEvent( QDragLeaveEvent *event ) final;
void dropEvent( QDropEvent *event ) final;
void mouseReleaseEvent(QMouseEvent *event) final;
void resizeEvent( QResizeEvent *event ) final;
void showEvent(QShowEvent *event) final;

private:
Expand Down Expand Up @@ -94,7 +93,6 @@ private Q_SLOTS:
bool save(bool saveAs = false);
QString selectFile( const QString &title, const QString &filename, bool fixedExt );
void selectPage(ria::qdigidoc4::Pages page);
void selectPageIcon( PageIcon* page );
void showCardMenu( bool show );
void showNotification( const QString &msg, bool isSuccess = false );
template <typename F>
Expand Down
Loading

0 comments on commit b996d84

Please sign in to comment.