Skip to content

Commit

Permalink
Merge pull request #121 from Nighty3098/InDev
Browse files Browse the repository at this point in the history
Merge
  • Loading branch information
Nighty3098 authored Jul 19, 2024
2 parents 81d1ad8 + 63e011c commit 86d3cc3
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 15 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,16 @@

</details>

<br>
<div align="center">
<h3>Tweaks</h3>

| Default theme | Custom theme |
|:--------------|:-------------|
| ![](imgs/default_theme.png) | ![](imgs/custom_theme.png) |



</div>

<div align="center">
<br><br>
Expand Down
Binary file added imgs/custom_theme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/default_theme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/CodeKeeper/keeperFunc/addConnects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ void MainWindow::createConnects()
}
}
});

connect(mainTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(0); });
connect(tasksTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(1); });
connect(notesTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(2); });
connect(projectsTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(3); });
}

void MainWindow::createShortcuts()
Expand Down
18 changes: 9 additions & 9 deletions src/CodeKeeper/keeperFunc/functional.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void MainWindow::setConnectionStatus()
isAutoSync->setIcon(
QPixmap(":/auto_sync_off.png").scaled(font_size.toInt() + 1, font_size.toInt() + 1, Qt::KeepAspectRatio, Qt::SmoothTransformation));
isAutoSync->setToolTip("<p style='color: #ffffff; border: 1px #ffffff; border-radius: 5px; "
"background-color: "
"background-color: "
"#0D1117;'>Auto sync off</p>");
}
}
Expand Down Expand Up @@ -535,10 +535,10 @@ void MainWindow::setStyle(QFont* selectedFont, int* font_size_int)
openAccountWindow->setFont(*selectedFont);
openAccountWindow->setStyleSheet("QPushButton {border: none; background-color: transparent; font-size: " + font_size + "pt;} ");

mainTabButton->setStyleSheet("background-color: transparent; border: none;");
tasksTabButton->setStyleSheet("background-color: transparent; border: none;");
notesTabButton->setStyleSheet("background-color: transparent; border: none;");
projectsTabButton->setStyleSheet("background-color: transparent; border: none;");
mainTabButton->setStyleSheet("QPushButton {background-color: transparent; border: none;}");
tasksTabButton->setStyleSheet("QPushButton {background-color: transparent; border: none;}");
notesTabButton->setStyleSheet("QPushButton {background-color: transparent; border: none;}");
projectsTabButton->setStyleSheet("QPushButton {background-color: transparent; border: none;}");

setH1B->setStyleSheet("background-color: transparent; border: none; margin-left: 4px;");
setH2B->setStyleSheet("background-color: transparent; border: none; margin-left: 4px;");
Expand Down Expand Up @@ -575,9 +575,11 @@ void MainWindow::setStyle(QFont* selectedFont, int* font_size_int)
setQuoteB->setToolTip("<p style='color: #ffffff; border-radius: 5px; background-color: "
"#0D1117;'>Set quote</p>");

menuButton->setStyleSheet("background-color: transparent; border: none;");
menuButton->setStyleSheet("border: 5px; border-radius: 10px;");

tasksMenuBtn->setStyleSheet("border: 5px; border-radius: 10px;");

tasksMenuBtn->setStyleSheet("background-color: transparent; border: none; border-width: 0px;");
projectsMenuButton->setStyleSheet("border: 5px; border-radius: 10px;");

isAutoSync->setStyleSheet("border: 0px; background-color: transparent;");

Expand All @@ -591,8 +593,6 @@ void MainWindow::setStyle(QFont* selectedFont, int* font_size_int)

nsProjects->setStyleSheet("font-size: " + font_size + "px;");

projectsMenuButton->setStyleSheet("background-color: transparent; border: none; border-width: 0px;");

label_3->setStyleSheet("font-size: " + font_size + "px;");

label_2->setStyleSheet("font-size: " + font_size + "px;");
Expand Down
6 changes: 1 addition & 5 deletions src/CodeKeeper/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
connectionTimer->start(100); // 1000ms = 1s

} else {
sizeGrip2->hide();
}

isConnected = new QPushButton("");
Expand Down Expand Up @@ -549,11 +550,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
tabButtons->addWidget(syncDataBtn);
tabButtons->addWidget(openSettingsBtn);

connect(mainTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(0); });
connect(tasksTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(1); });
connect(notesTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(2); });
connect(projectsTabButton, &QPushButton::clicked, [=]() { tabs->setCurrentIndex(3); });

// open homepage
tabs->setCurrentIndex(0);

Expand Down
Binary file modified src/resources/note.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 86d3cc3

Please sign in to comment.