breadcrumbs qa btn, colors update

This commit is contained in:
Zira project 2020-02-16 22:08:53 +05:00
parent fca2b511a3
commit f531a765fe
11 changed files with 70 additions and 6 deletions

View File

@ -9,8 +9,8 @@ editor_line_map_scroll_bg_color = #1b443d
editor_line_map_scroll_area_bg_color = #323235
editor_search_bg_color = #3c3f41
editor_breadcrumbs_bg_color = #314661
editor_breadcrumbs_warning_bg_color = #9a6e4e
editor_breadcrumbs_error_bg_color = #924a4a
editor_breadcrumbs_warning_bg_color = #3f3533
editor_breadcrumbs_error_bg_color = #1d181a
editor_breadcrumbs_color = #9fc4d6
editor_widget_border_color = #15365f
editor_selected_line_bg_color = #342f31

View File

@ -544,6 +544,18 @@ QFileDialog QToolButton:pressed
border: 1px solid #4d5052;
}
QTabWidget QToolButton,
Breadcrumbs QToolButton
{
border: none;
}
QTabWidget QToolButton:pressed,
Breadcrumbs QToolButton:pressed
{
background: none;
}
QProgressBar
{
border: 1px solid #0076af;

View File

@ -545,6 +545,18 @@ QFileDialog QToolButton:pressed
border: 1px solid #1666e0;
}
QTabWidget QToolButton,
Breadcrumbs QToolButton
{
border: none;
}
QTabWidget QToolButton:pressed,
Breadcrumbs QToolButton:pressed
{
background: none;
}
QProgressBar
{
border: 1px solid #25b9ff;

View File

@ -11,6 +11,7 @@
#include <QRegularExpression>
#include <QLabel>
#include <QHash>
#include <QToolButton>
#include "spellcheckerinterface.h"
#include "settings.h"
#include "highlight.h"
@ -205,6 +206,7 @@ private slots:
void reloadRequested();
void spellCheck(bool suggest = true, bool forceRehighlight = true);
void spellCheckPasted();
void qaBtnClicked();
private:
SpellCheckerInterface * spellChecker;
CompleteWords * CW;
@ -234,6 +236,7 @@ private:
Highlight * highlight;
QWidget * breadcrumbs;
QWidget * lineAnnotation;
QToolButton * qaBtn;
QFont editorFont;
QFont editorPopupFont;

View File

@ -47,5 +47,6 @@
<file alias="output.png">resources/images/icons/output.png</file>
<file alias="separator.png">resources/images/icons/separator.png</file>
<file alias="leveldown.png">resources/images/icons/leveldown.png</file>
<file alias="separator-double.png">resources/images/icons/separator-double.png</file>
</qresource>
</RCC>

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

View File

@ -544,6 +544,18 @@ QFileDialog QToolButton:pressed
border: 1px solid #008dc1;
}
QTabWidget QToolButton,
Breadcrumbs QToolButton
{
border: none;
}
QTabWidget QToolButton:pressed,
Breadcrumbs QToolButton:pressed
{
background: none;
}
QProgressBar
{
border: 1px solid #0076af;

View File

@ -545,6 +545,18 @@ QFileDialog QToolButton:pressed
border: 1px solid #1666e0;
}
QTabWidget QToolButton,
Breadcrumbs QToolButton
{
border: none;
}
QTabWidget QToolButton:pressed,
Breadcrumbs QToolButton:pressed
{
background: none;
}
QProgressBar
{
border: 1px solid #25b9ff;

View File

@ -9,7 +9,7 @@
Breadcrumbs::Breadcrumbs(Editor * codeEditor) : QWidget(codeEditor)
{
editor = codeEditor;
setCursor(Qt::PointingHandCursor);
//setCursor(Qt::PointingHandCursor);
}
QSize Breadcrumbs::sizeHint() const {
@ -23,7 +23,7 @@ void Breadcrumbs::paintEvent(QPaintEvent *event)
void Breadcrumbs::mousePressEvent(QMouseEvent * /*e*/)
{
emit editor->breadcrumbsClick(editor->getTabIndex());
//emit editor->breadcrumbsClick(editor->getTabIndex());
}
void Breadcrumbs::setText(QString txt)

View File

@ -312,6 +312,12 @@ Editor::Editor(SpellCheckerInterface * spellChecker, Settings * settings, Highli
std::string showBreadcrumbsStr = settings->get("editor_breadcrumbs_enabled");
if (showBreadcrumbsStr == "yes") showBreadcrumbs = true;
qaBtn = new QToolButton(breadcrumbs);
qaBtn->setIcon(QIcon(":/icons/separator-double.png"));
//qaBtn->setIconSize(QSize(breadcrumbs->height(), breadcrumbs->height()));
qaBtn->setToolTip(tr("Quick Access"));
connect(qaBtn, SIGNAL(pressed()), this, SLOT(qaBtnClicked()));
// complete popup
completePopup = new CompletePopup(this);
completePopup->setFont(editorPopupFont);
@ -1281,6 +1287,7 @@ void Editor::updateWidgetsGeometry()
lineMark->setGeometry(QRect(cr.left()+lineW, cr.top()+breadcrumbsH, markW, cr.top()+cr.height()-searchH-hScrollH));
lineMap->setGeometry(QRect(cr.right()-mapW-vScrollW+1, cr.top(), mapW+vScrollW, cr.top()+cr.height()));
breadcrumbs->setGeometry(QRect(cr.left(), cr.top(), cr.width()-mapW-vScrollW, breadcrumbsH));
qaBtn->setGeometry(0, 0, lineW, breadcrumbsH-1);
}
void Editor::backtab()
@ -6599,3 +6606,8 @@ void Editor::searchInFilesRequested()
QString text = curs.selectedText();
emit searchInFiles(text);
}
void Editor::qaBtnClicked()
{
emit breadcrumbsClick(tabIndex);
}

View File

@ -185,8 +185,8 @@ void Settings::applyDarkColors()
data["editor_line_map_scroll_area_bg_color"] = "#262635";
data["editor_search_bg_color"] = "#232627";
data["editor_breadcrumbs_bg_color"] = "#314661";
data["editor_breadcrumbs_warning_bg_color"] = "#9a6e4e";
data["editor_breadcrumbs_error_bg_color"] = "#924a4a";
data["editor_breadcrumbs_warning_bg_color"] = "#3f3533";
data["editor_breadcrumbs_error_bg_color"] = "#1d181a";
data["editor_breadcrumbs_color"] = "#9fc4d6";
data["editor_widget_border_color"] = "#15365f";
data["editor_selected_line_bg_color"] = "#1f1d23";