natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI Beautify

Browse Source
This commit is contained in:
Balkron
2020-11-02 01:33:19 +05:00
parent 39752259e3
commit fa3939217a
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/external/qt-color-widgets/src/abstract_widget_list.cpp vendored
View File

@@ -45,7 +45,7 @@ AbstractWidgetList::AbstractWidgetList(QWidget *parent) :
QVBoxLayout *verticalLayout = new QVBoxLayout(this);
verticalLayout->setContentsMargins(0, 0, 0, 0);
p->table = new QTableWidget(this);
verticalLayout->addWidget(p->table);
@@ -55,7 +55,7 @@ AbstractWidgetList::AbstractWidgetList(QWidget *parent) :
p->table->insertColumn(2);
p->table->insertColumn(3);
p->table->setColumnWidth(0,64);
p->table->setColumnWidth(0,97);
p->table->setColumnWidth(1,24);
p->table->setColumnWidth(2,24);
p->table->setColumnWidth(3,24);
@@ -65,7 +65,7 @@ AbstractWidgetList::AbstractWidgetList(QWidget *parent) :
p->table->setShowGrid(false);
QPushButton* add_button = new QPushButton(noggit::ui::font_awesome_icon(noggit::ui::font_awesome::plus),
tr("Add New"));
tr("Add Color"));
verticalLayout->addWidget(add_button);
connect(add_button,&QAbstractButton::clicked,this, &AbstractWidgetList::append);
@@ -116,18 +116,13 @@ void AbstractWidgetList::appendWidget(QWidget *w)
int row = count();
p->table->insertRow(row);
QString button_style =
"QToolButton { \n "
" border: none; \n "
"} \n";
QWidget* b_up = create_button(w,&p->mapper_up, noggit::ui::font_awesome_icon(noggit::ui::font_awesome::chevronup),tr(""), tr("Move Up"));
b_up->setStyleSheet(button_style);
QWidget* b_down = create_button(w,&p->mapper_down, noggit::ui::font_awesome_icon(noggit::ui::font_awesome::chevrondown),tr(""), tr("Move Down"));
b_down->setStyleSheet(button_style);
QWidget* b_remove = create_button(w,&p->mapper_remove, noggit::ui::font_awesome_icon(noggit::ui::font_awesome::timescircle),tr(""), tr("Remove"));
QWidget* b_remove = create_button(w,&p->mapper_remove, noggit::ui::font_awesome_icon(noggit::ui::font_awesome::times),tr(""), tr("Remove"));
QPalette pal = b_up->palette();
pal.setColor(QPalette::Window, Qt::black);
b_remove->setStyleSheet(button_style);
if ( row == 0 )
b_up->setEnabled(false);
else

2
src/noggit/ui/Help.cpp
View File

@@ -56,8 +56,6 @@ namespace noggit
generate_hotkey_row({font_noggit::q, font_noggit::e}, "\a,\aMove up and down", basic_controls_layout);
generate_hotkey_row({font_noggit::w, font_noggit::a , font_noggit::s , font_noggit::d}, "\a\a\a\aMove left, right, forward, backwards", basic_controls_layout);
generate_hotkey_row({font_noggit::home}, "\aMove position to the cursor", basic_controls_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::c}, "\a+\aSwitch cursor type", basic_controls_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::alt}, "\a+\aToggle cursor options", basic_controls_layout);
generate_hotkey_row({font_noggit::m}, "\aShow map", basic_controls_layout);
generate_hotkey_row({font_noggit::u}, "\a2D texture editor", basic_controls_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::f1}, "\a+\aThis help", basic_controls_layout);