Browse Source

Basic layout implemented

Ivan Arkhipov 3 years ago
parent
commit
9de447de49

+ 11 - 10
src/Legacy/widgets/mainwindow.cpp

@@ -236,14 +236,15 @@ void MainWindow::on_menuentry_2_clicked()
 {
     current_active_entry_ = ui->menuentry_2;
     hideAllContentWidgets();
-    settings_widget_->show();
+//    settings_widget_->show();
+    help_widget_->show();
 }
 
 void MainWindow::on_menuentry_3_clicked()
 {
-    current_active_entry_ = ui->menuentry_3;
-    hideAllContentWidgets();
-    help_widget_->show();
+//    current_active_entry_ = ui->menuentry_3;
+//    hideAllContentWidgets();
+//    help_widget_->show();
 }
 
 void MainWindow::on_menuentry_4_clicked()
@@ -297,7 +298,7 @@ void MainWindow::setupMenuHoverWidget()
 
     connect(ui->menuentry_1, &MenuEntry::entryIsHovered, this, &MainWindow::onHoverMenuentry);
     connect(ui->menuentry_2, &MenuEntry::entryIsHovered, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_3, &MenuEntry::entryIsHovered, this, &MainWindow::onHoverMenuentry);
+//    connect(ui->menuentry_3, &MenuEntry::entryIsHovered, this, &MainWindow::onHoverMenuentry);
     connect(ui->menuentry_4, &MenuEntry::entryIsHovered, this, &MainWindow::onHoverMenuentry);
 
     current_active_entry_ = ui->menuentry_1;
@@ -325,7 +326,7 @@ void MainWindow::moveMenuHoverWidget(MenuEntry *target)
 
     ui->menuentry_1->raise();
     ui->menuentry_2->raise();
-    ui->menuentry_3->raise();
+//    ui->menuentry_3->raise();
     ui->menuentry_4->raise();
 }
 
@@ -350,10 +351,10 @@ void MainWindow::hideAllContentWidgets()
 
 void MainWindow::updateFontSizes()
 {
-    ui->menuentry_1->setFont(trajan_10pt);
-    ui->menuentry_2->setFont(trajan_10pt);
-    ui->menuentry_3->setFont(trajan_10pt);
-    ui->menuentry_4->setFont(trajan_10pt);
+    ui->menuentry_1->setFont(trajan_9pt);
+    ui->menuentry_2->setFont(trajan_9pt);
+//    ui->menuentry_3->setFont(trajan_10pt);
+    ui->menuentry_4->setFont(trajan_9pt);
 }
 
 void MainWindow::on_closeButton_clicked()

+ 36 - 53
src/Legacy/widgets/mainwindow.ui

@@ -108,15 +108,15 @@
     <property name="styleSheet">
      <string notr="true">border-image:transparent;</string>
     </property>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,0,8,6,5">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,0,6,0,5">
      <property name="spacing">
-      <number>10</number>
+      <number>24</number>
      </property>
      <property name="sizeConstraint">
       <enum>QLayout::SetDefaultConstraint</enum>
      </property>
      <property name="leftMargin">
-      <number>35</number>
+      <number>24</number>
      </property>
      <property name="topMargin">
       <number>0</number>
@@ -149,6 +149,9 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
@@ -159,7 +162,7 @@
         <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
-        <string>  главная  </string>
+        <string>  русификация  </string>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -177,52 +180,13 @@
      </item>
      <item>
       <widget class="MenuEntry" name="menuentry_2">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <family>Trajan Pro 3</family>
-         <pointsize>10</pointsize>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="mouseTracking">
-        <bool>true</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color: rgb(255, 255, 255);</string>
-       </property>
-       <property name="text">
-        <string>  настройки  </string>
-       </property>
-       <property name="scaledContents">
-        <bool>true</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="flat" stdset="0">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="MenuEntry" name="menuentry_3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
+       <property name="baseSize">
         <size>
          <width>0</width>
          <height>0</height>
@@ -236,14 +200,20 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(255, 255, 255);</string>
        </property>
        <property name="text">
-        <string notr="true">  помощь  </string>
+        <string>  как это работает?  </string>
        </property>
        <property name="scaledContents">
         <bool>true</bool>
@@ -251,6 +221,9 @@
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
+       <property name="default" stdset="0">
+        <bool>false</bool>
+       </property>
        <property name="flat" stdset="0">
         <bool>true</bool>
        </property>
@@ -278,6 +251,9 @@
          <bold>false</bold>
         </font>
        </property>
+       <property name="cursor">
+        <cursorShape>PointingHandCursor</cursorShape>
+       </property>
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
@@ -301,6 +277,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QWidget" name="widget" native="true">
        <property name="sizePolicy">
@@ -309,24 +298,18 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="spacing">
          <number>5</number>
         </property>
         <property name="leftMargin">
-         <number>10</number>
+         <number>24</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
         <property name="rightMargin">
-         <number>0</number>
+         <number>10</number>
         </property>
         <property name="bottomMargin">
          <number>0</number>

+ 1 - 5
src/Legacy/widgets/statuswidget.cpp

@@ -260,14 +260,12 @@ void StatusWidget::onPatchDownloaderStarted() {
     process_completed_tooltip_hide_timer_.stop();
     all_patch_operations_finished_ = false;
     ui->game_button->setEnabled(false);
-    ui->check_for_updates_button->setEnabled(false);
     setToolTipMessage("Проверка обновлений русификации...", E_PROCESS);
 }
 
 void StatusWidget::onPatchDownloaderFinished() {
     all_patch_operations_finished_ = true;
     ui->game_button->setEnabled(true);
-    ui->check_for_updates_button->setEnabled(true);
     setToolTipMessage("Скачивание данных русификации завершено!", E_PROCESS);
     process_completed_tooltip_hide_timer_.start();
 }
@@ -289,14 +287,12 @@ void StatusWidget::onPatchInstallerStarted() {
     process_completed_tooltip_hide_timer_.stop();
     all_patch_operations_finished_ = false;
     ui->game_button->setEnabled(false);
-    ui->check_for_updates_button->setEnabled(false);
     setToolTipMessage("<p style=\"font-size: 22px; \">Подготовка русификатора...</p>", E_PROCESS);
 }
 
 void StatusWidget::onPatchInstallerFinished() {
     all_patch_operations_finished_ = true;
     ui->game_button->setEnabled(true);
-    ui->check_for_updates_button->setEnabled(true);
     setToolTipMessage("<p style=\"font-size: 22px; \">Все операции выполнены!</p>", E_PROCESS);
     process_completed_tooltip_hide_timer_.start();
 }
@@ -334,7 +330,7 @@ void StatusWidget::on_game_button_clicked()
 
 void StatusWidget::createTooltipMessageWidget(QString tooltip_id)
 {
-    tooltip_widgets_[tooltip_id] = new QLabel(ui->galadriel_widget);
+    tooltip_widgets_[tooltip_id] = new QLabel(this);
     tooltip_widgets_[tooltip_id]->setGeometry(ui->galadriel_tooltip_example->geometry());
     tooltip_widgets_[tooltip_id]->setStyleSheet(ui->galadriel_tooltip_example->styleSheet());
     tooltip_widgets_[tooltip_id]->setFont(ui->galadriel_tooltip_example->font());

+ 448 - 69
src/Legacy/widgets/statuswidget.ui

@@ -130,9 +130,9 @@ QScrollBar:vertical {
   <widget class="WeeklyCodeWidget" name="weekly_code_widget" native="true">
    <property name="geometry">
     <rect>
-     <x>780</x>
+     <x>800</x>
      <y>10</y>
-     <width>201</width>
+     <width>181</width>
      <height>61</height>
     </rect>
    </property>
@@ -143,76 +143,13 @@ QScrollBar:vertical {
     <string notr="true"/>
    </property>
   </widget>
-  <widget class="QWidget" name="galadriel_widget" native="true">
-   <property name="geometry">
-    <rect>
-     <x>310</x>
-     <y>16</y>
-     <width>541</width>
-     <height>511</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">QWidget#galadriel_widget{
-border-image: url(:/characters/galadriel_with_text.png);
-}</string>
-   </property>
-   <widget class="QToolButton" name="check_for_updates_button">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>470</y>
-      <width>32</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">border-image: url(:/buttons/restart.png);</string>
-    </property>
-    <property name="text">
-     <string/>
-    </property>
-   </widget>
-   <widget class="QLabel" name="galadriel_tooltip_example">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>29</x>
-      <y>17</y>
-      <width>371</width>
-      <height>114</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <family>EB Garamond</family>
-      <pointsize>12</pointsize>
-      <italic>false</italic>
-     </font>
-    </property>
-    <property name="styleSheet">
-     <string notr="true"/>
-    </property>
-    <property name="text">
-     <string>TEST TOOLTIP USED FOR STYLE DESC</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignCenter</set>
-    </property>
-    <property name="wordWrap">
-     <bool>true</bool>
-    </property>
-   </widget>
-  </widget>
   <widget class="QPushButton" name="game_button">
    <property name="geometry">
     <rect>
-     <x>820</x>
+     <x>819</x>
      <y>460</y>
-     <width>150</width>
-     <height>60</height>
+     <width>151</width>
+     <height>51</height>
     </rect>
    </property>
    <property name="sizePolicy">
@@ -271,12 +208,454 @@ QPushButton#game_button:disabled {
     <bool>true</bool>
    </property>
   </widget>
-  <zorder>galadriel_widget</zorder>
+  <widget class="QWidget" name="widget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>290</x>
+     <y>480</y>
+     <width>521</width>
+     <height>24</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>26</width>
+     <height>24</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>16777215</width>
+     <height>24</height>
+    </size>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">border-image: url(:/buttons/progressbar.png) 0 0 0 0 stretch stretch;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="galadriel_tooltip_example">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="geometry">
+    <rect>
+     <x>330</x>
+     <y>440</y>
+     <width>411</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>EB Garamond</family>
+     <pointsize>12</pointsize>
+     <italic>false</italic>
+    </font>
+   </property>
+   <property name="styleSheet">
+    <string notr="true"/>
+   </property>
+   <property name="text">
+    <string>TEST TOOLTIP USED FOR STYLE DESC</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+   <property name="wordWrap">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QWidget" name="sub_entry_1" native="true">
+   <property name="geometry">
+    <rect>
+     <x>300</x>
+     <y>10</y>
+     <width>481</width>
+     <height>131</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">QWidget#sub_entry_1{
+	background-color: rgba(31, 19, 7, 155);
+	border-radius: 5px;
+	border: 1px solid rgba(149, 149, 149, 155);
+    background-attachment: fixed;
+}</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="verticalSpacing">
+     <number>10</number>
+    </property>
+    <item row="1" column="0">
+     <widget class="QWidget" name="widget_2" native="true">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="game_folder_label">
+         <property name="font">
+          <font>
+           <family>Crimson Text</family>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">
+background-color: none;</string>
+         </property>
+         <property name="text">
+          <string>Папка с игрой:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="game_folder_path">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Crimson Text</family>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">
+background-color: none;</string>
+         </property>
+         <property name="text">
+          <string>(не выбрано)</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="change_folder_button">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>36</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="cursor">
+          <cursorShape>PointingHandCursor</cursorShape>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">border-image: url(:/buttons/folder.png);
+background-color: none;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="sub_entry_1_title">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <family>EB Garamond</family>
+        <pointsize>11</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>● Параметры игры  ●</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="wordWrap">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QWidget" name="widget_5" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>8</pointsize>
+       </font>
+      </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="lotro_base_language_label">
+         <property name="font">
+          <font>
+           <family>Crimson Text</family>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Версия игры для перевода?</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="lotro_base_language_combobox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Crimson Text</family>
+           <pointsize>11</pointsize>
+          </font>
+         </property>
+         <property name="focusPolicy">
+          <enum>Qt::ClickFocus</enum>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">background: silver;
+color: black;
+border-radius: 3px;</string>
+         </property>
+         <property name="currentText">
+          <string>Английскую</string>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+         </property>
+         <property name="frame">
+          <bool>true</bool>
+         </property>
+         <item>
+          <property name="text">
+           <string>Английскую</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Немецкую</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Французскую</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="sub_entry_3" native="true">
+   <property name="geometry">
+    <rect>
+     <x>300</x>
+     <y>150</y>
+     <width>481</width>
+     <height>101</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">QWidget#sub_entry_3 {
+	background-color: rgba(31, 19, 7, 155);
+	border-radius: 5px;
+	border: 1px solid rgba(149, 149, 149, 155);
+    background-attachment: fixed;
+}</string>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <property name="spacing">
+     <number>12</number>
+    </property>
+    <item>
+     <widget class="QLabel" name="sub_entry_3_title">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <family>EB Garamond</family>
+        <pointsize>11</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>● Компоненты перевода ●</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="wordWrap">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QWidget" name="graphics_block" native="true">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <property name="spacing">
+        <number>3</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="graphics_block_label">
+         <property name="font">
+          <font>
+           <family>Crimson Text</family>
+           <pointsize>12</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Изображения</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="helper_label">
+         <property name="minimumSize">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">QLabel#helper_label {
+	background-color: rgba(31, 19, 7, 155);
+	border-radius: 10px;
+	border: 1px solid rgba(149, 149, 149, 155);
+    background-attachment: fixed;
+}</string>
+         </property>
+         <property name="text">
+          <string>?</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="checkBox">
+         <property name="text">
+          <string>CheckBox</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
   <zorder>news_label</zorder>
   <zorder>news_scroll_area</zorder>
   <zorder>game_button</zorder>
   <zorder>server_status_widget</zorder>
   <zorder>weekly_code_widget</zorder>
+  <zorder>widget</zorder>
+  <zorder>galadriel_tooltip_example</zorder>
+  <zorder>sub_entry_1</zorder>
+  <zorder>sub_entry_3</zorder>
  </widget>
  <customwidgets>
   <customwidget>