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

Update font and help

Browse Source
This commit is contained in:
Balkron
2020-10-31 02:19:04 +05:00
parent 6c268ef750
commit f91a8741a6
4 changed files with 702 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/noggit_font.ttf
View File

Binary file not shown.

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

@@ -26,6 +26,9 @@ namespace noggit
QString header_style =
"QLabel { \n "
" font-weight: bold; \n "
" margin-top: 8px; \n "
" margin-bottom: 4px; \n "
" margin-left: 150px; \n "
"} \n ";
@@ -47,22 +50,22 @@ namespace noggit
label->setStyleSheet(header_style);
basic_controls_layout->addRow(label);
generate_hotkey_row({font_noggit::rmb_drag}, "\a - Rotate camera", basic_controls_layout);
generate_hotkey_row({font_noggit::lmb}, "\a - Select chunk or object", basic_controls_layout);
generate_hotkey_row({font_noggit::i}, "\a - Invert mouse up and down", basic_controls_layout);
generate_hotkey_row({font_noggit::q, font_noggit::e}, "\a,\a - Invert mouse up and down", basic_controls_layout);
generate_hotkey_row({font_noggit::w, font_noggit::a , font_noggit::s , font_noggit::d}, "\a\a\a\a - Move left, right, forward, backwards", basic_controls_layout);
generate_hotkey_row({font_noggit::home}, "\a - Move position to the cursor", basic_controls_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::c}, "\a+\a - Switch cursor type", basic_controls_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::alt}, "\a+\a - Toggle cursor options", basic_controls_layout);
generate_hotkey_row({font_noggit::m}, "\a - Show map", basic_controls_layout);
generate_hotkey_row({font_noggit::u}, "\a - 2D texture editor", basic_controls_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::f1}, "\a+\a - This help", basic_controls_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::j}, "\a+\a - reload an adt under the camera", basic_controls_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::r}, "\a+\a - Turn camera 180 degrees", basic_controls_layout);
generate_hotkey_row({font_noggit::shift}, "\a + 1, 2, 3, or 4 - Set a predefined camera speed", basic_controls_layout);
generate_hotkey_row({font_noggit::alt, font_noggit::f4}, "\a+\a - exit to main menu", basic_controls_layout);
generate_hotkey_row({font_noggit::l}, "\a - Change lookat (useful for assigning to graphic tablet styli buttons).", basic_controls_layout);
generate_hotkey_row({font_noggit::rmb_drag}, "\aRotate camera", basic_controls_layout);
generate_hotkey_row({font_noggit::lmb}, "\aSelect chunk or object", basic_controls_layout);
generate_hotkey_row({font_noggit::i}, "\aInvert mouse up and down", basic_controls_layout);
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);
generate_hotkey_row({font_noggit::shift, font_noggit::j}, "\a+\aReload an adt under the camera", basic_controls_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::r}, "\a+\aTurn camera 180 degrees", basic_controls_layout);
generate_hotkey_row({font_noggit::shift}, "\a+ 1, 2, 3 or 4 Set a predefined camera speed", basic_controls_layout);
generate_hotkey_row({font_noggit::alt, font_noggit::f4}, "\a+\aExit to main menu", basic_controls_layout);
generate_hotkey_row({font_noggit::l}, "\aToggle top view (hint: it's faster to use with graphic tablet stylus buttons)", basic_controls_layout);
generate_hotkey_row({}, "", basic_controls_layout); // padding
auto toggles_layout(new QFormLayout(this));
@@ -72,18 +75,18 @@ namespace noggit
label_toggle->setStyleSheet(header_style);
toggles_layout->addRow(label_toggle);
generate_hotkey_row({font_noggit::f1}, "\a - Toggle M2s", toggles_layout);
generate_hotkey_row({font_noggit::f2}, "\a - Toggle WMO doodads set", toggles_layout);
generate_hotkey_row({font_noggit::f3}, "\a - Toggle ground", toggles_layout);
generate_hotkey_row({font_noggit::f4}, "\a - Toggle water", toggles_layout);
generate_hotkey_row({font_noggit::f6}, "\a - Toggle WMOs", toggles_layout);
generate_hotkey_row({font_noggit::f7}, "\a - Toggle chunk (red) and ADT (green) lines", toggles_layout);
generate_hotkey_row({font_noggit::f8}, "\a - Toggle detailed window", toggles_layout);
generate_hotkey_row({font_noggit::f9}, "\a - Toggle map contour", toggles_layout);
generate_hotkey_row({font_noggit::f10}, "\a - Toggle wireframe", toggles_layout);
generate_hotkey_row({font_noggit::f11}, "\a - Toggle model animations", toggles_layout);
generate_hotkey_row({font_noggit::f12}, "\a - Toggle fog", toggles_layout);
generate_hotkey_row({}, "1-9 - Select the editing modes", toggles_layout);
generate_hotkey_row({font_noggit::f1}, "\aToggle M2s", toggles_layout);
generate_hotkey_row({font_noggit::f2}, "\aToggle WMO doodads set", toggles_layout);
generate_hotkey_row({font_noggit::f3}, "\aToggle ground", toggles_layout);
generate_hotkey_row({font_noggit::f4}, "\aToggle water", toggles_layout);
generate_hotkey_row({font_noggit::f6}, "\aToggle WMOs", toggles_layout);
generate_hotkey_row({font_noggit::f7}, "\aToggle chunk (red) and ADT (green) lines", toggles_layout);
generate_hotkey_row({font_noggit::f8}, "\aToggle detailed window", toggles_layout);
generate_hotkey_row({font_noggit::f9}, "\aToggle map contour", toggles_layout);
generate_hotkey_row({font_noggit::f10}, "\aToggle wireframe", toggles_layout);
generate_hotkey_row({font_noggit::f11}, "\aToggle model animations", toggles_layout);
generate_hotkey_row({font_noggit::f12}, "\aToggle fog", toggles_layout);
generate_hotkey_row({}, "1 - 9 Select the editing modes", toggles_layout);
auto files_layout(new QFormLayout(this));
base_layout->addLayout(files_layout, 1, 0);
@@ -92,11 +95,11 @@ namespace noggit
label_files->setStyleSheet(header_style);
files_layout->addRow(label_files);
generate_hotkey_row({font_noggit::f5}, "\a - Save bookmark", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::s}, "\a+\a - Save all changed ADT tiles", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::s}, "\a+\a+\a - Save ADT tile at camera position", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::a}, "\a+\a+\a- Save all loaded ADT tiles", files_layout);
generate_hotkey_row({font_noggit::g}, "\a - Save port commands to ports.txt", files_layout);
generate_hotkey_row({font_noggit::f5}, "\aSave bookmark", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::s}, "\a+\a Save all changed ADT tiles", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::s}, "\a+\a+\aSave ADT tile at camera position", files_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::shift, font_noggit::a}, "\a+\a+\aSave all loaded ADT tiles", files_layout);
generate_hotkey_row({font_noggit::g}, "\aSave port commands to ports.txt", files_layout);
auto adjust_layout(new QFormLayout(this));
base_layout->addLayout(adjust_layout, 1, 1);
@@ -105,10 +108,10 @@ namespace noggit
label_adjust->setStyleSheet(header_style);
adjust_layout->addRow(label_adjust);
generate_hotkey_row({font_noggit::o, font_noggit::p}, "\a/\a- Slower / Faster movement", adjust_layout);
generate_hotkey_row({font_noggit::b, font_noggit::n}, "\a/\a- Slower / Faster time", adjust_layout);
generate_hotkey_row({font_noggit::j}, "\a- Pause time", adjust_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::plus, font_noggit::minus}, "\a+\a/\a- Fog distance when no model is selected", adjust_layout);
generate_hotkey_row({font_noggit::o, font_noggit::p}, "\aor\aSlower / Faster movement", adjust_layout);
generate_hotkey_row({font_noggit::b, font_noggit::n}, "\aor\aSlower / Faster time", adjust_layout);
generate_hotkey_row({font_noggit::j}, "\aPause time", adjust_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::plus, font_noggit::minus}, "\a+\aor\aFog distance when no model is selected", adjust_layout);
auto flag_widget (new QWidget (this));
auto flag_layout (new QFormLayout (flag_widget));
@@ -117,24 +120,24 @@ namespace noggit
holes_label->setStyleSheet(header_style);
flag_layout->addRow(holes_label);
generate_hotkey_row({font_noggit::shift, font_noggit::lmb}, "\a+\a- Fog distance when no model is selected", flag_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::lmb}, "\a+\a- Add hole", flag_layout);
generate_hotkey_row({font_noggit::t}, "\a- Remove all holes on ADT", flag_layout);
generate_hotkey_row({font_noggit::alt, font_noggit::t}, "\a+\a- Remove all ground on ADT", flag_layout);
generate_hotkey_row({font_noggit::shift, font_noggit::lmb}, "\a+\aFog distance when no model is selected", flag_layout);
generate_hotkey_row({font_noggit::ctrl, font_noggit::lmb}, "\a+\aAdd hole", flag_layout);
generate_hotkey_row({font_noggit::t}, "\aRemove all holes on ADT", flag_layout);
generate_hotkey_row({font_noggit::alt, font_noggit::t}, "\a+\aRemove all ground on ADT", flag_layout);
auto impass_flags_label = new QLabel("Impassible Flags:");
impass_flags_label->setStyleSheet(header_style);
flag_layout->addRow(impass_flags_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Paint flag", flag_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Clear flag", flag_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aPaint flag", flag_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aClear flag", flag_layout);
auto areaid_label = new QLabel("AreaID Flags:");
areaid_label->setStyleSheet(header_style);
flag_layout->addRow(areaid_label);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Pick existing AreaID", flag_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Paint selected AreaID", flag_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aPick existing AreaID", flag_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aPaint selected AreaID", flag_layout);
auto ground_widget (new QWidget (this));
@@ -147,49 +150,49 @@ namespace noggit
ground_label->setStyleSheet(header_style);
ground_column1_layout->addRow(ground_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::f1 }, "\a+\a - Toggle ground edit mode", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\a - Change brush size", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\a - Change speed", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::f1 }, "\a+\aToggle ground edit mode", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange speed", ground_column1_layout);
auto raise_label = new QLabel("Terrain mode \"raise / lower\":");
auto raise_label = new QLabel("Raise / Lower tool:");
raise_label->setStyleSheet(header_style);
ground_column1_layout->addRow(raise_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Raise terrain", ground_column1_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Lower terrain", ground_column1_layout);
generate_hotkey_row({ font_noggit::y }, "\a - Switch to next type", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\a - Change inner radius", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aRaise terrain", ground_column1_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aLower terrain", ground_column1_layout);
generate_hotkey_row({ font_noggit::y }, "\aSwitch to next type", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\aChange inner radius", ground_column1_layout);
auto raise_label_vm = new QLabel("Terrain mode \"raise / lower\" (vertex mode only):");
auto raise_label_vm = new QLabel("Raise / Lower tool (vertex mode):");
raise_label_vm->setStyleSheet(header_style);
ground_column1_layout->addRow(raise_label_vm);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Select vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Deselect vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::c }, "\a - Clear selection", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\a - Flatten vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::rmb_drag }, "\a+\a - Orient vertices toward the mouse cursor", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::rmb_drag }, "\a+\a - Change vertices height", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\a - Change angle", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\a - Change orientation", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aSelect vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aDeselect vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::c }, "\aClear selection", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aFlatten vertices", ground_column1_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::rmb_drag }, "\a+\aOrient vertices toward the mouse cursor", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::rmb_drag }, "\a+\aChange vertices height", ground_column1_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", ground_column1_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", ground_column1_layout);
auto ground_column2_layout(new QFormLayout(this));
ground_layout->addLayout(ground_column2_layout, 0, 1);
auto flatten_label = new QLabel("Terrain mode \"flatten / blur\":");
auto flatten_label = new QLabel("Flatten / Blur tool:");
flatten_label->setStyleSheet(header_style);
ground_column2_layout->addRow(flatten_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Flatten terrain", ground_column2_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Blur terrain", ground_column2_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Toggle flatten angle", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::t }, "\a+\a - Toggle flatten type", ground_column2_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\a - Change angle", ground_column2_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\a - Change orientation", ground_column2_layout);
generate_hotkey_row({ font_noggit::y }, "\a - Switch to next type", ground_column2_layout);
generate_hotkey_row({ font_noggit::f }, "\a - Set relative point", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\a - Toggle flatten relative mode", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\a - Change height", ground_column2_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aFlatten terrain", ground_column2_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aBlur terrain", ground_column2_layout);
generate_hotkey_row({ font_noggit::t }, "\aToggle flatten angle", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::t }, "\a+\aToggle flatten type", ground_column2_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", ground_column2_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", ground_column2_layout);
generate_hotkey_row({ font_noggit::y }, "\aSwitch to next type", ground_column2_layout);
generate_hotkey_row({ font_noggit::f }, "\aSet relative point", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aToggle flatten relative mode", ground_column2_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange height", ground_column2_layout);
auto texture_widget (new QWidget (this));
@@ -199,37 +202,37 @@ namespace noggit
common_controls_label->setStyleSheet(header_style);
texture_layout->addRow(common_controls_label);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Open texture picker for the chunk", texture_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aOpen texture picker for the chunk", texture_layout);
auto paint_label = new QLabel("Paint:");
paint_label->setStyleSheet(header_style);
texture_layout->addRow(paint_label);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::shift, font_noggit::alt, font_noggit::lmb }, "\a+\a+\a+\a - Open texture picker for the chunk", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Draw texture or fills if chunk is empty", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\a - Change radius", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\a - Change hardness", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\a - Change pressure", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\a - Change strength (gradient)", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::r }, "\a+\a - Toggle min and max strength (gradient)", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Toggle spray brush", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\a - Change spray radius", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\a - Change spray pressure", texture_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::shift, font_noggit::alt, font_noggit::lmb }, "\a+\a+\a+\aOpen texture picker for the chunk", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aDraw texture or fills if chunk is empty", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange radius", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::rmb_drag }, "\a+\aChange hardness", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange pressure", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange strength (gradient)", texture_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::r }, "\a+\aToggle min and max strength (gradient)", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\aToggle spray brush", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange spray radius", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange spray pressure", texture_layout);
auto swapper_label = new QLabel("Swap:");
swapper_label->setStyleSheet(header_style);
texture_layout->addRow(swapper_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Swap texture", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\a - Change radius", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Toggle brush swapper", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aSwap texture", texture_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange radius", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\aToggle brush swapper", texture_layout);
auto anim_label = new QLabel("Anim:");
anim_label->setStyleSheet(header_style);
texture_layout->addRow(anim_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Update animation", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Switch between add/remove animation mode", texture_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aUpdate animation", texture_layout);
generate_hotkey_row({ font_noggit::t }, "\aSwitch between add/remove animation mode", texture_layout);
auto water_widget (new QWidget (this));
@@ -239,15 +242,15 @@ namespace noggit
water_label->setStyleSheet(header_style);
water_layout->addRow(water_label);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Add liquid", water_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Remove liquid", water_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\a - Change brush size", water_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Toggle angled mode", water_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\a - Change orientation", water_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\a - Change angle", water_layout);
generate_hotkey_row({ font_noggit::f }, "\a - Set lock position to cursor position", water_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\a - Toggle lock mode", water_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\a - Change height", water_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aAdd liquid", water_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aRemove liquid", water_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", water_layout);
generate_hotkey_row({ font_noggit::t }, "\aToggle angled mode", water_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aChange orientation", water_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::mmb }, "\a+\aChange angle", water_layout);
generate_hotkey_row({ font_noggit::f }, "\aSet lock position to cursor position", water_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::f }, "\a+\aToggle lock mode", water_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::mmb }, "\a+\aChange height", water_layout);
auto object_widget (new QWidget (this));
@@ -257,48 +260,48 @@ namespace noggit
object_label->setStyleSheet(header_style);
object_layout->addRow(object_label);
generate_hotkey_row({ font_noggit::mmb }, "\a - Move object", object_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\a - Scale M2", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl, font_noggit::alt, font_noggit::lmb }, "\a/\a/\a+\a - Rotate object", object_layout);
generate_hotkey_row({ font_noggit::ctrl }, "\a+ 0-9 - Change doodadset of selected WMO", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::r }, "\a+\a - Reset rotation", object_layout);
generate_hotkey_row({ font_noggit::h }, "\a - Toggle selected model/wmo visibility", object_layout);
generate_hotkey_row({ font_noggit::mmb }, "\aMove object", object_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::mmb }, "\a+\aScale M2", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl, font_noggit::alt, font_noggit::lmb }, "\aor\aor\a+\aRotate object", object_layout);
generate_hotkey_row({ font_noggit::ctrl }, "\a+ 0 - 9 Change doodadset of selected WMO", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::r }, "\a+\aReset rotation", object_layout);
generate_hotkey_row({ font_noggit::h }, "\aToggle selected model/wmo visibility", object_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::h }, "\a+\a - Hide/Show hidden model/wmo", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::h }, "\a+\a - Clear hidden model/wmo list", object_layout);
generate_hotkey_row({ font_noggit::page_down }, "\a - Set object to ground level", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::c, font_noggit::c }, "\a+\a or \a - Copy object to clipboard", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::v, font_noggit::v }, "\a+\a or \a - Paste object on mouse position", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::b }, "\a+\a - Duplicate selected object to mouse position", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::v }, "\a+\a - Import last M2 from WMV", object_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::v }, "\a+\a - Import last WMO from WMV", object_layout);
generate_hotkey_row({ font_noggit::t }, "\a - Switch between paste modes", object_layout);
generate_hotkey_row({ font_noggit::f }, "\a - Move selection to cursor position", object_layout);
generate_hotkey_row({ font_noggit::minus, font_noggit::plus }, "\a/\a - Scale M2", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 7 / 9 - Rotate object", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 4 / 8 / 6 / 2 - Vertical position", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 1 / 3 - Move up/down", object_layout);
generate_hotkey_row({ font_noggit::shift }, "Holding \a 1 / 3 - Double speed", object_layout);
generate_hotkey_row({ font_noggit::ctrl }, "Holding \a 1 / 3 - Triple speed", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl }, "Holding \a and \a together - half speed", object_layout);
generate_hotkey_row({ font_noggit::page_down }, "\aSet object to ground level", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::c }, "\a+\aCopy object to clipboard", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::v }, "\a+\aPaste object on mouse position", object_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::b }, "\a+\aDuplicate selected object to mouse position", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::v }, "\a+\aImport last M2 from WMV", object_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::v }, "\a+\aImport last WMO from WMV", object_layout);
generate_hotkey_row({ font_noggit::t }, "\aSwitch between paste modes", object_layout);
generate_hotkey_row({ font_noggit::f }, "\aMove selection to cursor position", object_layout);
generate_hotkey_row({ font_noggit::minus, font_noggit::plus }, "\aor\aScale M2", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 7 or 9 Rotate object", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 4 or 8 or 6 or 2 Vertical position", object_layout);
generate_hotkey_row({ font_noggit::num }, "\a 1 or 3 Move up/down", object_layout);
generate_hotkey_row({ font_noggit::shift }, "Holding \a 1 / 3 Double speed", object_layout);
generate_hotkey_row({ font_noggit::ctrl }, "Holding \a 1 / 3 Triple speed", object_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::ctrl }, "Holding \a and \a Half speed", object_layout);
auto shader_widget (new QWidget (this));
auto shader_layout (new QFormLayout (shader_widget));
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\a - Add shader", shader_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\a - Remove shader", shader_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\a - Change brush size", shader_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\a - Change speed", shader_layout);
generate_hotkey_row({ font_noggit::mmb }, "\a - Pick shader color from the ground", shader_layout);
generate_hotkey_row({ font_noggit::plus }, "\a - Add current color to palette", shader_layout);
generate_hotkey_row({ font_noggit::shift, font_noggit::lmb }, "\a+\aAdd shader", shader_layout);
generate_hotkey_row({ font_noggit::ctrl, font_noggit::lmb }, "\a+\aRemove shader", shader_layout);
generate_hotkey_row({ font_noggit::alt, font_noggit::lmb_drag }, "\a+\aChange brush size", shader_layout);
generate_hotkey_row({ font_noggit::space, font_noggit::lmb_drag }, "\a+\aChange speed", shader_layout);
generate_hotkey_row({ font_noggit::mmb }, "\aPick shader color from the ground", shader_layout);
generate_hotkey_row({ font_noggit::plus }, "\aAdd current color to palette", shader_layout);
layout->addWidget(tabs);
tabs->addTab(base_widget, "Base");
tabs->addTab(ground_widget, "Terrain");
tabs->addTab(texture_widget, "Texture");
tabs->addTab(water_widget, "Water");
tabs->addTab(object_widget, "Objects");
tabs->addTab(shader_widget, "Shader");
tabs->addTab(flag_widget, "Flags/Hole/Area");
tabs->addTab(base_widget, "Basic");
tabs->addTab(ground_widget, "Terrain Editors");
tabs->addTab(texture_widget, "Texture Painter");
tabs->addTab(water_widget, "Water Editor");
tabs->addTab(object_widget, "Object Editor");
tabs->addTab(shader_widget, "Vertex Painter");
tabs->addTab(flag_widget, "Impass Flag / Hole Cutter / Area ID");
}
@@ -321,7 +324,7 @@ namespace noggit
auto label = new QLabel(this);
QIcon hotkey_icon = font_noggit_icon(*icon++);
label->setPixmap(hotkey_icon.pixmap(20, 20));
label->setPixmap(hotkey_icon.pixmap(22, 22));
row_layout->addWidget(label);
from = ++description;

3
src/noggit/ui/Water.cpp
View File

@@ -227,7 +227,8 @@ namespace noggit
);
updateData();
setMinimumWidth(sizeHint().width());
setMinimumWidth(250);
}
void water::updatePos(tile_index const& newTile)

4
src/noggit/ui/texturing_tool.cpp
View File

@@ -110,7 +110,8 @@ namespace noggit
"} \n"
"QSlider::vertical { \n"
" width: 35px; \n"
" max-height: 100px; \n"
" min-height: 100px; \n"
" max-height: 200px; \n"
"} \n"
"QSlider::add-page:vertical { \n"
" background: transparent; \n"
@@ -374,7 +375,6 @@ namespace noggit
setMinimumWidth(250);
setMaximumWidth(250);
setMinimumHeight(540);
}
void texturing_tool::update_brush_hardness()