Ver 1.1.0 pre-release

lotromanager.cpp

@@ -27,6 +27,18 @@ void LotroManager::startGame(){
     if (dat_locale_ == PATCHED)
         args << "-disablePatch";
 
+
+    if(FileSystem::fileExists(QApplication::applicationDirPath() + "/user.ini")){
+        QSettings login(QApplication::applicationDirPath() + "/user.ini", QSettings::IniFormat );
+        login.beginGroup("Account");
+        QString username = login.value("username", "").toString();
+        QString password = login.value("password", "").toString();
+        login.endGroup();
+        args << "-username" << username << "-password" << password;
+    }
+
+    qDebug() << "Запускаем игру со следующими аргументами: " << args;
+
     QFile f(app->config->getValue("Local", "folder") + "/TurbineLauncher.exe");
     QProcess process;
 
@@ -238,6 +250,7 @@ int LotroManager::checkDatFile(){
 }
 
 void LotroManager::applyMicroPatch(){
+    return;
     App *app = &App::getInstance();
     app->logSectionStart("Установка мгновенных обновлений");
     app->helper->setState("busy");
@@ -247,7 +260,10 @@ void LotroManager::applyMicroPatch(){
     database_.InitDatabase(app->helper->stringToChar(app->network->micropatch));
     int indb = database_.CountRows();
     qInfo("%s:%i: %s%d", __FILE__, __LINE__, "Файлов в обновлении: ", indb);
-    for(int i = 0; i<=indb; i++){ processFile(); }
+
+    for(int i = 0; i <= indb; i++ ) {
+        processFile();
+    }
     //for (int i = 0; i < 5; i++) app->datfiles[i].CommitChanges();
     database_.CloseDatabase();
 
@@ -330,6 +346,7 @@ void LotroManager::processFile(){
 }
 
 void LotroManager::installMicroPatch(){
+    return;
     App *app = &App::getInstance();
     if(app->config->getValue("Updates", "micro") != "true") return;
 
@@ -349,6 +366,7 @@ void LotroManager::installMicroPatch(){
 }
 
 void LotroManager::prepareMicroPatch(){
+    return;
     App *app = &App::getInstance();
     app->logSectionStart("Автоматическая проверка обновлений");
     app->helper->setState("busy");

main.cpp

@@ -47,7 +47,7 @@ int main(int argc, char *argv[]){
 
     if (!FileSystem::fileExists("dpi.stml")) {
         QApplication a(argc, argv);
-        std::vector<float> dpi_scales = {1, 1.25, 1.5, 2, 2.5};
+        std::vector<float> dpi_scales = {1, 1.5, 2, 2.5};
 
         float current_dpi = ((QGuiApplication*)QCoreApplication::instance())->primaryScreen()->physicalDotsPerInch() / 96.0;
 

mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>513</width>
-    <height>345</height>
+    <width>427</width>
+    <height>310</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -251,7 +251,7 @@
     <widget class="QLabel" name="textsStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>5</y>
        <width>131</width>
        <height>35</height>
@@ -264,7 +264,7 @@
     <widget class="QLabel" name="soundsStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>40</y>
        <width>131</width>
        <height>35</height>
@@ -277,7 +277,7 @@
     <widget class="QLabel" name="imagesStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>75</y>
        <width>131</width>
        <height>35</height>
@@ -290,7 +290,7 @@
     <widget class="QLabel" name="loadscreensStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>110</y>
        <width>131</width>
        <height>35</height>
@@ -303,7 +303,7 @@
     <widget class="QLabel" name="fontsStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>145</y>
        <width>131</width>
        <height>35</height>
@@ -316,7 +316,7 @@
     <widget class="QLabel" name="videosStatus">
      <property name="geometry">
       <rect>
-       <x>210</x>
+       <x>200</x>
        <y>180</y>
        <width>121</width>
        <height>35</height>
@@ -1043,7 +1043,7 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>162</y>
+       <y>182</y>
        <width>371</width>
        <height>31</height>
       </rect>
@@ -1052,7 +1052,7 @@
       <string>TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -1068,23 +1068,23 @@
       </rect>
      </property>
      <property name="text">
-      <string>Дизайн и работа с графикой</string>
+      <string>Дизайн и работа с графикой:</string>
      </property>
     </widget>
     <widget class="QLabel" name="translatorslist">
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>106</y>
+       <y>100</y>
        <width>371</width>
-       <height>31</height>
+       <height>65</height>
       </rect>
      </property>
      <property name="text">
       <string>TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -1103,7 +1103,7 @@
       <string>TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
     <widget class="QLabel" name="programmers">
@@ -1116,20 +1116,20 @@
       </rect>
      </property>
      <property name="text">
-      <string>Техническая и программная часть</string>
+      <string>Техническая и программная часть:</string>
      </property>
     </widget>
     <widget class="QLabel" name="helpers">
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>145</y>
+       <y>165</y>
        <width>366</width>
        <height>21</height>
       </rect>
      </property>
      <property name="text">
-      <string>Помогали словом и делом</string>
+      <string>Помогали словом и делом:</string>
      </property>
     </widget>
     <widget class="QLabel" name="designerslist">
@@ -1145,14 +1145,14 @@
       <string>TextLabel</string>
      </property>
      <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
     </widget>
     <widget class="QLabel" name="translators">
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>85</y>
+       <y>80</y>
        <width>361</width>
        <height>21</height>
       </rect>
@@ -1746,7 +1746,7 @@
      </rect>
     </property>
     <property name="text">
-     <string>Наследие: v2.0.0</string>
+     <string>Наследие: v1.1.0</string>
     </property>
    </widget>
    <widget class="QPushButton" name="designButton">

styles/book/skin.ini → res/styles/book/skin.ini

@@ -66,13 +66,13 @@ left=130
 top=360
 
 [exthintLabel]
-width=370
+width=350
 height=20
 left=130
 top=375
 
 [mainbox]
-width=370
+width=360
 height=230
 left=150
 top=115
@@ -84,7 +84,7 @@ left=430
 top=2050
 
 [optbox]
-width=350
+width=360
 height=240
 left=135
 top=115
@@ -96,7 +96,7 @@ left=50
 top=2150
 
 [newsbox]
-width=430
+width=360
 height=230
 left=115
 top=120
@@ -108,7 +108,7 @@ left=445
 top=2150
 
 [helpbox]
-width=400
+width=360
 height=250
 left=120
 top=115
@@ -120,7 +120,7 @@ left=30
 top=2200
 
 [aboutbox]
-width=400
+width=360
 height=240
 left=125
 top=110
@@ -192,6 +192,14 @@ height=24
 left=32
 top=437
 
+[goTitle]
+width=270
+height=26
+left=30
+top=125
+text=\x412\x44b\x431\x435\x440\x438\x442\x435 \x44f\x437\x44b\x43a \x434\x43b\x44f \x43f\x440\x43e\x434\x43e\x43b\x436\x435\x43d\x438\x44f
+
+
 [goOriginal]
 width=70
 height=70
@@ -232,7 +240,7 @@ shy=2
 width=300
 height=26
 left=10
-top=60
+top=85
 
 [mainTitle]
 width=570

styles/book/style.css → res/styles/book/style.css

@@ -6,11 +6,11 @@ QMainWindow {
 	
 }
 
-QLabel, QCheckBox { color: #333; font: 8pt "Arial";	}
+QLabel, QCheckBox { color: #333; font: 11px "Arial";	}
 
 QGroupBox{
 	border:none;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
 }
 
@@ -20,7 +20,7 @@ QTextBrowser { border:none; }
 QPushButton {
 	border-image: url(:/res/styles/vintage/button2.png) 0 0 0 0 stretch stretch;
 	color: #EFE1AF;/*#F8E600*/
-	font: 12pt "Segoe Print";
+	font: 14px "Segoe Print";
 	padding:5px;
 }
 
@@ -31,25 +31,25 @@ QPushButton:hover:!pressed{ border: 1px solid red; }
  
 QLabel#titleLabel {
 	color: #453425; /*#FBB540*/
-	font: 16pt "Segoe Script";
+	font: 18px "Segoe Scripx";
 	 
 }
 
  QLabel#mainTitle {
 	color: #453425; /*#FBB540*/
-	font: 18pt "Segoe Script";
+	font: 20px "Segoe Scripx";
 	font-weight:bold;	 
 }
  
 QLabel#hintLabel{
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
 } 
 
 QLabel#hintLabel, QLabel#news1Title, QLabel#news2Title, QLabel#news3Title , QLabel#news4Title{
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
 	text-decoration:none;
 }
@@ -61,29 +61,29 @@ QLabel#news1Image, QLabel#news2Image, QLabel#news3Image , QLabel#news4Image{
 
  QLabel#exthintLabel{
 	color: #333;
-	font: 8pt "Arial";	 
+	font: 12px "Arial";	 
  }  
  
  QLabel#textsTitle, QLabel#imagesTitle, QLabel#soundsTitle, QLabel#loadscreensTitle, QLabel#fontsTitle, QLabel#videosTitle{
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
  }  
  
 QLabel#textsStatus, QLabel#imagesStatus, QLabel#soundsStatus, QLabel#loadscreensStatus, QLabel#fontsStatus, QLabel#videosStatus{
 	color: #333;
-	font: 10pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 }   
  
 QPushButton#lotropathButton{
-	font: 10pt "MS Shell Dlg 2";
+	font: 13px "MS Shell Dlg 2";
 	color: #453425;
 	border-image: url(:/res/styles/vintage/folder.png);
 	
 } 
 
 /*QLabel#mainboxImage{ border-image: url(:/res/styles/vintage/gandalf.png); } 
-QLabel#optboxImage{ border-image: url(:/res/styles/vintage/boromir.png); }  
+QLabel#opxboxImage{ border-image: url(:/res/styles/vintage/boromir.png); }  
 QLabel#newsboxImage{ border-image: url(:/res/styles/vintage/saruman.png); }
 QLabel#helpboxImage{ border-image: url(:/res/styles/vintage/elrond.png); }  
 QLabel#aboutboxImage{ border-image: url(:/res/styles/vintage/eowin.png); }*/
@@ -92,18 +92,18 @@ QLabel#aboutboxImage{ border-image: url(:/res/styles/vintage/eowin.png); }*/
 QTextBrowser {
 	background:transparent;
 	color:#000;
-	font: 10pt "TrebushetMS";	
+	font: 13px "TrebushetMS";	
 }
 
  QLabel#programmers, QLabel#designers, QLabel#translators, QLabel#helpers, QLabel#moderators{
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
  } 
 
 QLabel#skinLabel{
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 14px "TrebushetMS";
 	font-weight:bold;
 } 
 
@@ -116,7 +116,7 @@ QGroupBox#dialog{ border-image: url(:/res/styles/book/start_window.png); }
 QGroupBox QLabel#dialogHeader, QGroupBox#startframe QLabel#goHeader{
 	padding-left:7px;
 	color: #453425;
-	font: 11pt "TrebushetMS";
+	font: 14px "TrebushetMS";
 	font-weight:bold;
 	margin-left:8px;
 	margin-right:8px;
@@ -130,7 +130,7 @@ QGroupBox QLabel#dialogImage{ margin:3px; }
 QGroupBox QLabel#dialogInfo{	
 	margin:7px;
 	padding:7px;
-	font: 10pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	color:#333;
 }
 
@@ -144,7 +144,7 @@ QLabel#Lamannia, QLabel#Landroval, QLabel#Laurelin, QLabel#Sirannon, QLabel#Bull
 }
 
 QPushButton#couponButton{
-	font:14px;
+	font:17px;
 	color: #333;
 	border-image: none;
 	background:transparent;
@@ -155,7 +155,7 @@ QPushButton#couponButton:hover{ border:none; }
 
 QLabel#couponTitle{	color: #333;font-weight:bold;}
 QLabel#lotropathLabel{ border:#BFBFBF solid 1px;border-width: 1px; background-color:rgba(19,0,0,0.25); padding-left:2px; }
-QLabel#footRed, QLabel#footYellow{font-size:13px; background: rgba(255,255,255,0.1); color: #000; padding-left:5px;}
+QLabel#footRed, QLabel#footYellow{font-size:17px; background: rgba(255,255,255,0.1); color: #000; padding-left:5px;}
 QLabel#loader{ background:transparent;}
 
 QPushButton#enButton{ border-image: url(:/res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
@@ -193,7 +193,7 @@ QGroupBox#startframe{
 QGroupBox#startframe QLabel#goTitle{
 	/*border-image: url(:/res/styles/vintage/header.png);*/
 	color: #4B2708;
-	font: 11pt "TrebushetMS";
+	font: 14px "TrebushetMS";
 }
 
 

res/styles/lotro/readme.css

@@ -1,6 +1,6 @@
 .title{
     color: #f7d77a; 
-    font: 11pt "Microsoft Sans Serif";
+    font: 11px "Microsoft Sans Serif";
     margin-top:20px;
 }
 

res/styles/lotro/skin.ini

@@ -17,31 +17,31 @@ left=740
 top=72
 
 [mainButton]
-width=138
+width=136
 height=26
 left=597
 top=261
 
 [optButton]
-width=138
+width=136
 height=26
 left=597
 top=300
 
 [newsButton]
-width=138
+width=136
 height=26
 left=597
 top=339
 
 [helpButton]
-width=138
+width=136
 height=26
 left=597
 top=377
 
 [aboutButton]
-width=138
+width=136
 height=26
 left=597
 top=414
@@ -72,7 +72,7 @@ left=97
 top=477
 
 [mainbox]
-width=450
+width=460
 height=230
 left=135
 top=215
@@ -84,7 +84,7 @@ left=450
 top=190
 
 [optbox]
-width=350
+width=460
 height=240
 left=125
 top=210
@@ -92,11 +92,11 @@ top=210
 [optboxImage]
 width=100
 height=240
-left=70ы
+left=70
 top=190
 
 [newsbox]
-width=430
+width=460
 height=230
 left=80
 top=225
@@ -193,16 +193,16 @@ left=325
 top=540
 
 [textBrowser]
-width=470
+width=478
 height=210
 left=10
 top=10
 
 [translatorslist]
-width=450
+width=470
 height=110
 left=10
-top=75
+top=100
 
 [helpers]
 width=420
@@ -220,7 +220,7 @@ top=183
 width=254
 height=26
 left=22
-top=80
+top=85
 
 [checkMicro]
 width=294

res/styles/lotro/style.css

@@ -1,24 +1,24 @@
 QMainWindow {
 	background-color: transparent;
-	background-image: url(styles/lotro/bg.png);
+	background-image: url(:res/styles/lotro/bg.png);
 	min-width:800px;
 	min-height:582px;
 }
 
 QLabel, QCheckBox {
-	font: 8pt "TrebushetMS";	
+	font: 11px "TrebushetMS";	
 	color: #FFF;
 }
 
 QGroupBox{ 
 	background-color:transparent;
 	border:none;
-	font: 11pt "Microsoft Sans Serif";
+	font: 15px "Microsoft Sans Serif";
 }
 
 QGroupBox::title {
 	color: #f7d77a;
-	font: 11pt "Microsoft Sans Serif";
+	font: 15px "Microsoft Sans Serif";
 
 }
 
@@ -28,9 +28,9 @@ QTextBrowser {
 
 QPushButton {
 	background-color: transparent;
-	background-image:url(styles/lotro/button.png) stretch; 
+	background-image:url(:res/styles/lotro/button.png) stretch; 
 	color: #FFF;/*#F8E600*/
-	font: 12pt "Lucida Sans Unicode";
+	font: 16px "Lucida Sans Unicode";
 
 }
 
@@ -38,87 +38,87 @@ QPushButton:hover { color: #f2ce2e; }
 QPushButton:pressed { background-color: transparent; }
 QPushButton:hover:!pressed{ border: 1px solid transparent; }
  
-QPushButton#enterButton { border-image: url(styles/lotro/enter.png) 0 0 0 0 stretch stretch; background:none; }  
-QPushButton#enterButton:hover { border-image: url(styles/lotro/enter_hover.png) 0 0 0 0 stretch stretch; } 
+QPushButton#enterButton { border-image: url(:res/styles/lotro/enter.png) 0 0 0 0 stretch stretch; background:none; }  
+QPushButton#enterButton:hover { border-image: url(:res/styles/lotro/enter_hover.png) 0 0 0 0 stretch stretch; } 
 
 
 QLabel#titleLabel {
 	color: #FFF;
-	font: 14pt "Lucida Sans Unicode";
+	font: 17px "Lucida Sans Unicode";
 }
  
 QLabel#hintLabel, QLabel#news1Title, QLabel#news2Title, QLabel#news3Title , QLabel#news4Title{
-	font: 11pt "Microsoft Sans Serif";
+	font: 15px "Microsoft Sans Serif";
 }
 
 QLabel#hintLabel{
 	color: #f7d77a;
-	font: 12pt "Lucida Sans Unicode";
+	font: 15px "Lucida Sans Unicode";
 }
 
 QLabel#news1Image, QLabel#news2Image, QLabel#news3Image , QLabel#news4Image{
-	border-image: url(:/res/styles/vintage/plane.png);
+	border-image: url(:res/styles/vintage/plane.png);
 	padding:3px;
 }
 
  QLabel#exthintLabel{
 	color: rgb(255, 255, 255);
-	font: 8pt "Microsoft Sans Serif";	 
+	font: 11px "Microsoft Sans Serif";	 
 }  
 
  QLabel#textsTitle, QLabel#imagesTitle, QLabel#soundsTitle, QLabel#loadscreensTitle, QLabel#fontsTitle, QLabel#videosTitle{
 	color: #f7d77a;
-	font: 11pt "Microsoft Sans Serif";
+	font: 14px "Microsoft Sans Serif";
 }  
 
 QLabel#textsStatus, QLabel#imagesStatus, QLabel#soundsStatus, QLabel#loadscreensStatus, QLabel#fontsStatus, QLabel#videosStatus{
 	color: #FFF;
-	font: 10pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 }   
 
 QPushButton#lotropathButton{
 	background:none; 
-	border-image: url(:/res/styles/vintage/folder.png);
+	border-image: url(:res/styles/vintage/folder.png);
 } 
 
-/*QLabel#mainboxImage{ border-image: url(:/res/styles/vintage/gandalf.png); } 
-QLabel#optboxImage{ border-image: url(:/res/styles/vintage/boromir.png); }  
-QLabel#newsboxImage{ border-image: url(:/res/styles/vintage/saruman.png); }
-QLabel#helpboxImage{ border-image: url(:/res/styles/vintage/elrond.png); }  
-QLabel#aboutboxImage{ border-image: url(:/res/styles/vintage/eowin.png); }*/
+/*QLabel#mainboxImage{ border-image: url(:res/styles/vintage/gandalf.png); } 
+QLabel#opxboxImage{ border-image: url(:res/styles/vintage/boromir.png); }  
+QLabel#newsboxImage{ border-image: url(:res/styles/vintage/saruman.png); }
+QLabel#helpboxImage{ border-image: url(:res/styles/vintage/elrond.png); }  
+QLabel#aboutboxImage{ border-image: url(:res/styles/vintage/eowin.png); }*/
   
 QTextBrowser {
 	background:transparent;
 	color:#FFF;
-	font: 10pt "TrebushetMS";	
+	font: 12px "TrebushetMS";	
 }
 
  QLabel#programmers, QLabel#designers, QLabel#translators, QLabel#helpers, QLabel#moderators{
 	color: #f7d77a;
-	font: 11pt "Microsoft Sans Serif";
+	font: 14px "Microsoft Sans Serif";
 	text-decoration:none;
 } 
 
 QLabel#skinLabel{
 	color: #f7d77a;
-	font: 11pt "Microsoft Sans Serif";
+	font: 13px "Microsoft Sans Serif";
 } 
 
-QPushButton#minimizeButton { background:none; border-image: url(styles/lotro/minimize.png) 0 0 0 0 stretch stretch; }
-QPushButton#closeButton { background:none; border-image: url(styles/lotro/quit.png) 0 0 0 0 stretch stretch; }
+QPushButton#minimizeButton { background:none; border-image: url(:res/styles/lotro/minimize.png) 0 0 0 0 stretch stretch; }
+QPushButton#closeButton { background:none; border-image: url(:res/styles/lotro/quit.png) 0 0 0 0 stretch stretch; }
 
 QGroupBox#dialogbox{
 	background:rgba(0,0,0,0.4);
 }
 
 QGroupBox#dialog{
-	border-image: url(styles/lotro/start_window_eodoro.png);
+	border-image: url(:res/styles/lotro/start_window_eodoro.png);
 }
 
 QGroupBox QLabel#dialogHeader{
 	padding-left:7px;
 	color: red;
-	font: 12pt "Microsoft Sans Serif";
+	font: 15px "Microsoft Sans Serif";
 	margin-left:5px;
 	margin-right:5px;
 	margin-top:3px;
@@ -130,24 +130,24 @@ QGroupBox QLabel#dialogImage{ margin:3px; }
 QGroupBox QLabel#dialogInfo{	
 	margin:7px;
 	padding:7px;
-	font: 10pt "TrebushetMS";
+	font: 12px "TrebushetMS";
 	color:#FFF;
 }
 
 QPushButton#okButton, QPushButton#cancelButton {
 	background:none; 
 	background-color:transparent;
-	border-image: url(styles/lotro/button_dialog.png) 0 0 5 0 stretch stretch;
+	border-image: url(:res/styles/lotro/button_dialog.png) 0 0 5 0 stretch stretch;
 }
 
 QLabel#Arkenstone, QLabel#Belegaer, QLabel#Brandywine, QLabel#Crickhollow, QLabel#Evernight, QLabel#Gladden, QLabel#Gwaihir,
 QLabel#Lamannia, QLabel#Landroval, QLabel#Laurelin, QLabel#Sirannon, QLabel#Bullroarer, QLabel#Crickhollow { 
-	border-image: url(:/res/styles/vintage/plane2.png);
+	border-image: url(:res/styles/vintage/plane2.png);
 	background-color: #555555; /*#8A0808 #173B0B*/
 }
 
 QPushButton#couponButton{
-	font: 15pt "Lucida Sans Unicode";
+	font: 19px "Lucida Sans Unicode";
 	color: #f2ce2e;
 	border-image: none;
 	background:transparent;
@@ -156,7 +156,7 @@ QPushButton#couponButton{
 QPushButton#couponButton:hover{ border:none; } 
 
 QLabel#couponTitle{	
-	font: 8pt "Lucida Sans Unicode";
+	font: 12px "Lucida Sans Unicode";
 	color: #FFF;
 }
 
@@ -169,9 +169,9 @@ QLabel#footRed{	color: red;font-weight:bold;}
 QLabel#footYellow{	color: #FFDC20;font-weight:bold;}
 QLabel#loader{ background:transparent;}
 
-QPushButton#enButton{ background:none; border-image: url(:/res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
-QPushButton#deButton{ background:none; border-image: url(:/res/styles/vintage/flag_de.png) 0 0 0 0 stretch stretch;}
-QPushButton#frButton{ background:none; border-image: url(:/res/styles/vintage/flag_fr.png) 0 0 0 0 stretch stretch;}
+QPushButton#enButton{ background:none; border-image: url(:res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
+QPushButton#deButton{ background:none; border-image: url(:res/styles/vintage/flag_de.png) 0 0 0 0 stretch stretch;}
+QPushButton#frButton{ background:none; border-image: url(:res/styles/vintage/flag_fr.png) 0 0 0 0 stretch stretch;}
 QPushButton#enButton:disabled, QPushButton#deButton:disabled, QPushButton#frButton:disabled{border-width: 1px; background-color: rgba(255,255,255,0.4);} 
 
 
@@ -183,15 +183,15 @@ QComboBox, QListView::item:selected{
 }
 
 QComboBox::drop-down{border-width:1px;}
-QComboBox::down-arrow{border-image:url(:/res/styles/vintage/downarrow.png);}
+QComboBox::down-arrow{border-image:url(:res/styles/vintage/downarrow.png);}
 QComboBox QAbstractItemView::item{ padding:5px; }
 
-QPushButton#goCancel{ background-color:transparent; background-image: url(styles/lotro/button_dialog.png) 0 0 0 0 stretch stretch;}
-QPushButton#goLocal{ background:none; border-image: url(styles/lotro/gorur.png) 0 0 0 0 stretch stretch;}
+QPushButton#goCancel{ background-color:transparent; background-image: url(:res/styles/lotro/button_dialog.png) 0 0 0 0 stretch stretch;}
+QPushButton#goLocal{ background:none; border-image: url(:res/styles/lotro/gorur.png) 0 0 0 0 stretch stretch;}
 QPushButton#goOriginal{ background:none;}
-QPushButton#goEnButton{ background:none; border-image: url(styles/lotro/goenr.png) 0 0 0 0 stretch stretch;}
-QPushButton#goDeButton{ background:none; border-image: url(styles/lotro/goder.png) 0 0 0 0 stretch stretch;}
-QPushButton#goFrButton{ background:none; border-image: url(styles/lotro/gofrr.png) 0 0 0 0 stretch stretch;}
+QPushButton#goEnButton{ background:none; border-image: url(:res/styles/lotro/goenr.png) 0 0 0 0 stretch stretch;}
+QPushButton#goDeButton{ background:none; border-image: url(:res/styles/lotro/goder.png) 0 0 0 0 stretch stretch;}
+QPushButton#goFrButton{ background:none; border-image: url(:res/styles/lotro/gofrr.png) 0 0 0 0 stretch stretch;}
 
 QGroupBox#startbox{
 	background:rgba(0,0,0,0.4);
@@ -199,19 +199,19 @@ QGroupBox#startbox{
 
 QGroupBox#startframe{
 	background:rgba(0,0,0,0.4);
-	border-image: url(styles/lotro/start_window_eodoro.png) 0 0 0 0 stretch stretch;
+	border-image: url(:res/styles/lotro/start_window_eodoro.png) 0 0 0 0 stretch stretch;
 }
 
 QGroupBox#startframe QLabel#goTitle{
 	color: #FFF;
-	font: 11pt "TrebushetMS";
+	font: 15px "TrebushetMS";
 	margin-top:10px;
 }
 
 QGroupBox#startframe QLabel#goHeader{
 	padding-left:7px;
 	color: #FFF;
-	font: 11pt "TrebushetMS";
+	font: 13px "TrebushetMS";
 	font-weight:bold;
 	margin-left:105px;
 	margin-right:5px;
@@ -222,6 +222,6 @@ QLabel#goHint{ color:#FFF; }
 QPushButton#repairButton{ 
 	background:none;
 	background-color:transparent;
-	border-image: url(styles/lotro/button_long.png) 0 0 0 0 stretch stretch;
+	border-image: url(:res/styles/lotro/button_long.png) 0 0 0 0 stretch stretch;
 	padding-bottom:2px;
 }

styles/vintage/skin.ini → res/styles/vintage/skin.ini

@@ -51,6 +51,8 @@ width=180
 height=48
 left=580
 top=470
+text=del
+
 
 [titleLabel]
 width=130
@@ -203,6 +205,13 @@ shblur=1
 shx=1
 shy=1
 
+[goTitle]
+width=270
+height=26
+left=30
+top=125
+text=\x412\x44b\x431\x435\x440\x438\x442\x435 \x44f\x437\x44b\x43a \x434\x43b\x44f \x43f\x440\x43e\x434\x43e\x43b\x436\x435\x43d\x438\x44f
+
 [goOriginal]
 width=91
 height=91

res/styles/vintage/style.css

@@ -1,36 +1,248 @@
 QMainWindow {
+	background-color: transparent;
 	background-image: url(:/res/styles/vintage/bg.png);
-	width:800px;
-	height:582px;
+	min-width:800px;
+	min-height:582px;
 	
 }
- 
-QPushButton {
-     border: 2px solid #8f8f91;
-     border-radius: 6px;
-     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde);
-     min-width: 80px;
 
+QLabel, QCheckBox {
+	color: #FFF;
+	font: 8px "Arial";	
 }
 
- QPushButton:pressed {
-     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa);
- }
+QGroupBox{
+	border:none;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+}
 
- QPushButton:flat {
-     border: none; /* для плоской кнопки границы нет */
- }
+QGroupBox::title {
+	color: #F7B754;	
+}
 
- QPushButton:default {
-     border-color: navy; /* делаем кнопку по умолчанию выпуклой */
- } 
- 
+QTextBrowser {
+	border:none;
+}
+
+
+QPushButton {
+	border-image: url(:/res/styles/vintage/button2.png) 0 0 0 0 stretch stretch;
+	color: #EFE1AF;/*#F8E600*/
+	font: 12px "Segoe Print";
+	padding:5px;
+}
+
+QPushButton:hover { color: #F9EA20; }
+QPushButton:pressed { background-color: transparent; }
+QPushButton:hover:!pressed{ border: 1px solid red; }
  
+QPushButton#enterButton { border-image: url(:/res/styles/vintage/enter.png) 0 0 0 0 stretch stretch; }  
+QPushButton#enterButton:hover { border-image: url(:/res/styles/vintage/enter_hover.png) 0 0 0 0 stretch stretch; } 
  
+QLabel#titleLabel {
+	color: #ECE7C4; /*#FBB540*/
+	font: 14px "Segoe Scripx";
+	font-weight:bold;	 
+}
  
  
+QLabel#hintLabel{
+	color: #FBB540;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+} 
  
+QLabel#hintLabel, QLabel#news1Title, QLabel#news2Title, QLabel#news3Title , QLabel#news4Title{
+	color: #F7B754;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+	text-decoration:none;
+}
+
+QLabel#news1Image, QLabel#news2Image, QLabel#news3Image , QLabel#news4Image{
+	border-image: url(:/res/styles/vintage/plane.png);
+	padding:3px;
+}
+
+ QLabel#exthintLabel{
+	color: rgb(255, 255, 255);
+	font: 8px "Arial";	 
+ }  
  
+ QLabel#textsTitle, QLabel#imagesTitle, QLabel#soundsTitle, QLabel#loadscreensTitle, QLabel#fontsTitle, QLabel#videosTitle{
+	color: #F7B754;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+ }  
  
+QLabel#textsStatus, QLabel#imagesStatus, QLabel#soundsStatus, QLabel#loadscreensStatus, QLabel#fontsStatus, QLabel#videosStatus{
+	color: #FFF;
+	font: 10px "TrebushetMS";
+}   
  
- 
+QPushButton#lotropathButton{
+	font: 10px "MS Shell Dlg 2";
+	color: rgb(255, 255, 255);
+	border-image: url(:/res/styles/vintage/folder.png);
+	
+} 
+
+QLabel#mainboxImage{ border-image: url(:/res/styles/vintage/gandalf.png); } 
+QLabel#opxboxImage{ border-image: url(:/res/styles/vintage/boromir.png); }  
+QLabel#newsboxImage{ border-image: url(:/res/styles/vintage/saruman.png); }
+QLabel#helpboxImage{ border-image: url(:/res/styles/vintage/elrond.png); }  
+QLabel#aboutboxImage{ border-image: url(:/res/styles/vintage/eowin.png); }
+  
+
+QTextBrowser {
+	background:transparent;
+	color:#FFF;
+	font: 10px "TrebushetMS";	
+}
+
+ QLabel#programmers, QLabel#designers, QLabel#translators, QLabel#helpers, QLabel#moderators{
+	color: #F7B754;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+ } 
+
+QLabel#skinLabel{
+	color: #F7B754;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+} 
+
+QPushButton#minimizeButton { border-image: url(:/res/styles/vintage/minimize.png) 0 0 0 0 stretch stretch; }
+QPushButton#closeButton { border-image: url(:/res/styles/vintage/close.png) 0 0 0 0 stretch stretch; }
+
+/*QMessageBox {
+	background:transparent;
+	border-image: url(:/res/styles/vintage/message.png);
+	color: #F7B754;
+	font: 11px "TrebushetMS";
+	
+	
+}
+
+QMessageBox QLabel {
+    color: #FFF;font: 9px "TrebushetMS";
+	background-color:rgba(0,0,0,0.4);
+	padding:7px;
+	margin-top:30px;
+}
+
+
+QMessageBox QPushButton {
+	border-image: url(:/res/styles/vintage/msgbutton.png);
+	min-width:50px;
+	max-height:24px;
+}*/
+
+QGroupBox#dialogbox{
+	background:rgba(0,0,0,0.4);
+}
+
+QGroupBox#dialog{
+	border-image: url(:/res/styles/vintage/start_window.png);
+}
+
+QGroupBox QLabel#dialogHeader{
+	border-image: url(:/res/styles/vintage/window_header_brown.png);
+	padding-left:7px;
+	color: #F2DA84;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+	margin-left:5px;
+	margin-right:5px;
+	margin-top:3px;
+}
+
+QGroupBox QLabel#dialogImage{ margin:3px; }
+
+QGroupBox QLabel#dialogInfo{	
+	margin:7px;
+	padding:7px;
+	font: 10px "TrebushetMS";
+	color:#333;
+	/*background-color:rgba(0,0,0,0.3)*/
+}
+
+QPushButton#okButton, QPushButton#cancelButton { margin-top:7px; }
+
+QLabel#Arkenstone, QLabel#Belegaer, QLabel#Brandywine, QLabel#Crickhollow, QLabel#Evernight, QLabel#Gladden, QLabel#Gwaihir,
+QLabel#Lamannia, QLabel#Landroval, QLabel#Laurelin, QLabel#Sirannon, QLabel#Bullroarer, QLabel#Crickhollow { 
+	border-image: url(:/res/styles/vintage/plane2.png);
+	background-color: #555555; /*#8A0808 #173B0B*/
+}
+
+QPushButton#couponButton{
+	font: 14px "MS Shell Dlg 2";
+	color: #FFFFE6;
+	border-image: none;
+	background:transparent;
+	font-weight:bold;
+	
+} 
+
+QPushButton#couponButton:hover{ border:none; } 
+
+QLabel#couponTitle{	color: #FFFFE6;font-weight:bold;}
+QLabel#lotropathLabel{ border:#BFBFBF solid 1px;border-width: 1px; background-color:rgba(19,0,0,0.25); padding-left:2px; }
+QLabel#footRed{	color: red;font-weight:bold;}
+QLabel#footYellow{	color: #FFDC20;font-weight:bold;}
+QLabel#loader{ background:transparent;}
+
+QPushButton#enButton{ border-image: url(:/res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
+QPushButton#deButton{ border-image: url(:/res/styles/vintage/flag_de.png) 0 0 0 0 stretch stretch;}
+QPushButton#frButton{ border-image: url(:/res/styles/vintage/flag_fr.png) 0 0 0 0 stretch stretch;}
+QPushButton#enButton:disabled, QPushButton#deButton:disabled, QPushButton#frButton:disabled{border-width: 1px; background-color: rgba(255,255,255,0.4);} 
+
+
+QComboBox, QListView::item:selected{
+	color:#FFFFFF;
+	background-color:rgba(0,0,0,0.1);
+	padding:1px;
+	subcontrol-origin: padding;
+}
+
+QComboBox::drop-down{border-width:1px;}
+QComboBox::down-arrow{border-image:url(:/res/styles/vintage/downarrow.png);}
+QComboBox QAbstractItemView::item{ padding:5px; }
+
+QPushButton#goCancel{ border-image: url(:/res/styles/vintage/gocancel.png) 0 0 0 0 stretch stretch;}
+QPushButton#goLocal{ border-image: url(:/res/styles/vintage/gorur.png) 0 0 0 0 stretch stretch;}
+QPushButton#goEnButton{ border-image: url(:/res/styles/vintage/goenr.png) 0 0 0 0 stretch stretch;}
+QPushButton#goDeButton{ border-image: url(:/res/styles/vintage/goder.png) 0 0 0 0 stretch stretch;}
+QPushButton#goFrButton{ border-image: url(:/res/styles/vintage/gofrr.png) 0 0 0 0 stretch stretch;}
+
+QGroupBox#startbox{
+	background:rgba(0,0,0,0.4);
+}
+
+QGroupBox#startframe{
+	background:rgba(0,0,0,0.4);
+	border-image: url(:/res/styles/vintage/start_window.png) 0 0 0 0 stretch stretch;
+}
+
+QGroupBox#startframe QLabel#goTitle{
+	/*border-image: url(:/res/styles/vintage/header.png);*/
+	color: #4B2708;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+}
+
+QGroupBox#startframe QLabel#goHeader{
+	border-image: url(:/res/styles/vintage/window_header_brown.png) 0 0 0 0 stretch stretch;
+	padding-left:7px;
+	color: #F2DA84;
+	font: 11px "TrebushetMS";
+	font-weight:bold;
+	margin-left:5px;
+	margin-right:5px;
+	margin-top:3px;
+}
+
+QLabel#goHint{ color:#4B2708; }
+
+

styles/lotro/readme.css

@@ -1,9 +0,0 @@
-.title{
-    color: #f7d77a; 
-    font: 11px "Microsoft Sans Serif";
-    margin-top:20px;
-}
-
-p{
-    margin-top:5px;
-}

styles/lotro/skin.ini

@@ -1,273 +0,0 @@
-[mainWindow]
-width=800
-height=582
-left=0
-top=0
-
-[minimizeButton]
-width=30
-height=25
-left=710
-top=72
-
-[closeButton]
-width=30
-height=25
-left=740
-top=72
-
-[mainButton]
-width=136
-height=26
-left=597
-top=261
-
-[optButton]
-width=136
-height=26
-left=597
-top=300
-
-[newsButton]
-width=136
-height=26
-left=597
-top=339
-
-[helpButton]
-width=136
-height=26
-left=597
-top=377
-
-[aboutButton]
-width=136
-height=26
-left=597
-top=414
-
-[enterButton]
-width=87
-height=25
-left=620
-top=460
-text=del
-
-[titleLabel]
-width=130
-height=30
-left=243
-top=185
-
-[hintLabel]
-width=290
-height=20
-left=97
-top=460
-
-[exthintLabel]
-width=430
-height=20
-left=97
-top=477
-
-[mainbox]
-width=450
-height=230
-left=135
-top=215
-
-[mainboxImage]
-width=130
-height=255
-left=450
-top=190
-
-[optbox]
-width=350
-height=240
-left=125
-top=210
-
-[optboxImage]
-width=100
-height=240
-left=70ы
-top=190
-
-[newsbox]
-width=430
-height=230
-left=80
-top=225
-
-[newsboxImage]
-width=100
-height=245
-left=475
-top=190
-
-[helpbox]
-width=460
-height=250
-left=87
-top=215
-
-[helpboxImage]
-width=120
-height=230
-left=87
-top=200
-
-[aboutbox]
-width=460
-height=240
-left=90
-top=220
-
-[aboutboxImage]
-width=75
-height=235
-left=490
-top=195
-
-[dialogHeader]
-width=400
-height=45
-left=0
-top=0
-align=center
-
-[okButton]
-width=114
-height=29
-left=0
-top=0
-
-[cancelButton]
-width=114
-height=29
-left=0
-top=0
-
-[serversbox]
-width=800
-height=65
-left=21
-top=514
-
-[couponButton]
-width=150
-height=48
-left=591
-top=167
-
-[couponTitle]
-width=150
-height=18
-left=591
-top=162
-
-[footRed]
-width=570
-height=18
-left=62
-top=502
-
-[footYellow]
-width=570
-height=18
-left=50
-top=502
-
-[loader]
-width=34
-height=34
-left=516
-top=459
-
-[labelVersion]
-width=150
-height=24
-left=325
-top=540
-
-[textBrowser]
-width=470
-height=210
-left=10
-top=10
-
-[translatorslist]
-width=450
-height=110
-left=10
-top=75
-
-[helpers]
-width=420
-height=18
-left=10
-top=168
-
-[helperslist]
-width=420
-height=36
-left=10
-top=183
-
-[repairButton]
-width=254
-height=26
-left=22
-top=85
-
-[checkMicro]
-width=294
-height=28
-left=10
-top=59
-
-[goOriginal]
-width=94
-height=56
-left=55
-top=33
-
-[goLocal]
-width=94
-height=56
-left=180
-top=33
-
-[goCancel]
-width=114
-height=26
-left=110
-top=128
-text=\x41e\x442\x43c\x435\x43d\x430
-
-[goTitle]
-width=270
-height=26
-left=30
-top=88
-text=\x412\x44b\x431\x435\x440\x438\x442\x435 \x44f\x437\x44b\x43a \x434\x43b\x44f \x43f\x440\x43e\x434\x43e\x43b\x436\x435\x43d\x438\x44f
-
-[dialogInfo]
-width=100%
-height=100%
-left=20
-top=40
-
-[htmlColors]
-a=#f7d77a[htmlColors]
-a=#f7d77a
-h3=#f7d77a
-p=#FFF
-
-[designButton]
-width=144
-height=29
-left=-400
-top=120

styles/lotro/style.css

@@ -1,227 +0,0 @@
-QMainWindow {
-	background-color: transparent;
-	background-image: url(:res/styles/lotro/bg.png);
-	min-width:800px;
-	min-height:582px;
-}
-
-QLabel, QCheckBox {
-	font: 12px "TrebushetMS";	
-	color: #FFF;
-}
-
-QGroupBox{ 
-	background-color:transparent;
-	border:none;
-	font: 15px "Microsoft Sans Serif";
-}
-
-QGroupBox::title {
-	color: #f7d77a;
-	font: 15px "Microsoft Sans Serif";
-
-}
-
-QTextBrowser {
-	border:none;
-}
-
-QPushButton {
-	background-color: transparent;
-	background-image:url(:res/styles/lotro/button.png) stretch; 
-	color: #FFF;/*#F8E600*/
-	font: 16px "Lucida Sans Unicode";
-
-}
-
-QPushButton:hover { color: #f2ce2e; }
-QPushButton:pressed { background-color: transparent; }
-QPushButton:hover:!pressed{ border: 1px solid transparent; }
- 
-QPushButton#enterButton { border-image: url(:res/styles/lotro/enter.png) 0 0 0 0 stretch stretch; background:none; }  
-QPushButton#enterButton:hover { border-image: url(:res/styles/lotro/enter_hover.png) 0 0 0 0 stretch stretch; } 
-
-
-QLabel#titleLabel {
-	color: #FFF;
-	font: 18px "Lucida Sans Unicode";
-}
- 
-QLabel#hintLabel, QLabel#news1Title, QLabel#news2Title, QLabel#news3Title , QLabel#news4Title{
-	font: 18px "Microsoft Sans Serif";
-}
-
-QLabel#hintLabel{
-	color: #f7d77a;
-	font: 16px "Lucida Sans Unicode";
-}
-
-QLabel#news1Image, QLabel#news2Image, QLabel#news3Image , QLabel#news4Image{
-	border-image: url(:res/styles/vintage/plane.png);
-	padding:3px;
-}
-
- QLabel#exthintLabel{
-	color: rgb(255, 255, 255);
-	font: 12px "Microsoft Sans Serif";	 
-}  
-
- QLabel#textsTitle, QLabel#imagesTitle, QLabel#soundsTitle, QLabel#loadscreensTitle, QLabel#fontsTitle, QLabel#videosTitle{
-	color: #f7d77a;
-	font: 15px "Microsoft Sans Serif";
-}  
-
-QLabel#textsStatus, QLabel#imagesStatus, QLabel#soundsStatus, QLabel#loadscreensStatus, QLabel#fontsStatus, QLabel#videosStatus{
-	color: #FFF;
-	font: 14px "TrebushetMS";
-}   
-
-QPushButton#lotropathButton{
-	background:none; 
-	border-image: url(:res/styles/vintage/folder.png);
-} 
-
-/*QLabel#mainboxImage{ border-image: url(:res/styles/vintage/gandalf.png); } 
-QLabel#opxboxImage{ border-image: url(:res/styles/vintage/boromir.png); }  
-QLabel#newsboxImage{ border-image: url(:res/styles/vintage/saruman.png); }
-QLabel#helpboxImage{ border-image: url(:res/styles/vintage/elrond.png); }  
-QLabel#aboutboxImage{ border-image: url(:res/styles/vintage/eowin.png); }*/
-  
-QTextBrowser {
-	background:transparent;
-	color:#FFF;
-	font: 14px "TrebushetMS";	
-}
-
- QLabel#programmers, QLabel#designers, QLabel#translators, QLabel#helpers, QLabel#moderators{
-	color: #f7d77a;
-	font: 15px "Microsoft Sans Serif";
-	text-decoration:none;
-} 
-
-QLabel#skinLabel{
-	color: #f7d77a;
-	font: 15px "Microsoft Sans Serif";
-} 
-
-QPushButton#minimizeButton { background:none; border-image: url(:res/styles/lotro/minimize.png) 0 0 0 0 stretch stretch; }
-QPushButton#closeButton { background:none; border-image: url(:res/styles/lotro/quit.png) 0 0 0 0 stretch stretch; }
-
-QGroupBox#dialogbox{
-	background:rgba(0,0,0,0.4);
-}
-
-QGroupBox#dialog{
-	border-image: url(:res/styles/lotro/start_window_eodoro.png);
-}
-
-QGroupBox QLabel#dialogHeader{
-	padding-left:7px;
-	color: red;
-	font: 16px "Microsoft Sans Serif";
-	margin-left:5px;
-	margin-right:5px;
-	margin-top:3px;
-	text-align:center;
-}
-
-QGroupBox QLabel#dialogImage{ margin:3px; }
-
-QGroupBox QLabel#dialogInfo{	
-	margin:7px;
-	padding:7px;
-	font: 14px "TrebushetMS";
-	color:#FFF;
-}
-
-QPushButton#okButton, QPushButton#cancelButton {
-	background:none; 
-	background-color:transparent;
-	border-image: url(:res/styles/lotro/button_dialog.png) 0 0 5 0 stretch stretch;
-}
-
-QLabel#Arkenstone, QLabel#Belegaer, QLabel#Brandywine, QLabel#Crickhollow, QLabel#Evernight, QLabel#Gladden, QLabel#Gwaihir,
-QLabel#Lamannia, QLabel#Landroval, QLabel#Laurelin, QLabel#Sirannon, QLabel#Bullroarer, QLabel#Crickhollow { 
-	border-image: url(:res/styles/vintage/plane2.png);
-	background-color: #555555; /*#8A0808 #173B0B*/
-}
-
-QPushButton#couponButton{
-	font: 19px "Lucida Sans Unicode";
-	color: #f2ce2e;
-	border-image: none;
-	background:transparent;
-} 
-
-QPushButton#couponButton:hover{ border:none; } 
-
-QLabel#couponTitle{	
-	font: 12px "Lucida Sans Unicode";
-	color: #FFF;
-}
-
-QLabel#lotropathLabel{ 
-		border:#BFBFBF solid 1px;border-width: 1px;
-	background-color:rgba(19,0,0,0.25); padding-left:2px; 
-}
-
-QLabel#footRed{	color: red;font-weight:bold;}
-QLabel#footYellow{	color: #FFDC20;font-weight:bold;}
-QLabel#loader{ background:transparent;}
-
-QPushButton#enButton{ background:none; border-image: url(:res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
-QPushButton#deButton{ background:none; border-image: url(:res/styles/vintage/flag_de.png) 0 0 0 0 stretch stretch;}
-QPushButton#frButton{ background:none; border-image: url(:res/styles/vintage/flag_fr.png) 0 0 0 0 stretch stretch;}
-QPushButton#enButton:disabled, QPushButton#deButton:disabled, QPushButton#frButton:disabled{border-width: 1px; background-color: rgba(255,255,255,0.4);} 
-
-
-QComboBox, QListView::item:selected{
-	color:#FFFFFF;
-	background-color:rgba(0,0,0,0.1);
-	padding:1px;
-	subcontrol-origin: padding;
-}
-
-QComboBox::drop-down{border-width:1px;}
-QComboBox::down-arrow{border-image:url(:res/styles/vintage/downarrow.png);}
-QComboBox QAbstractItemView::item{ padding:5px; }
-
-QPushButton#goCancel{ background-color:transparent; background-image: url(:res/styles/lotro/button_dialog.png) 0 0 0 0 stretch stretch;}
-QPushButton#goLocal{ background:none; border-image: url(:res/styles/lotro/gorur.png) 0 0 0 0 stretch stretch;}
-QPushButton#goOriginal{ background:none;}
-QPushButton#goEnButton{ background:none; border-image: url(:res/styles/lotro/goenr.png) 0 0 0 0 stretch stretch;}
-QPushButton#goDeButton{ background:none; border-image: url(:res/styles/lotro/goder.png) 0 0 0 0 stretch stretch;}
-QPushButton#goFrButton{ background:none; border-image: url(:res/styles/lotro/gofrr.png) 0 0 0 0 stretch stretch;}
-
-QGroupBox#startbox{
-	background:rgba(0,0,0,0.4);
-}
-
-QGroupBox#startframe{
-	background:rgba(0,0,0,0.4);
-	border-image: url(:res/styles/lotro/start_window_eodoro.png) 0 0 0 0 stretch stretch;
-}
-
-QGroupBox#startframe QLabel#goTitle{
-	color: #FFF;
-	font: 15px "TrebushetMS";
-	margin-top:10px;
-}
-
-QGroupBox#startframe QLabel#goHeader{
-	padding-left:7px;
-	color: #FFF;
-	font: 15px "TrebushetMS";
-	font-weight:bold;
-	margin-left:105px;
-	margin-right:5px;
-}
-
-QLabel#goHint{ color:#FFF; }
-
-QPushButton#repairButton{ 
-	background:none;
-	background-color:transparent;
-	border-image: url(:res/styles/lotro/button_long.png) 0 0 0 0 stretch stretch;
-	padding-bottom:2px;
-}

styles/vintage/style.css

@@ -1,248 +0,0 @@
-QMainWindow {
-	background-color: transparent;
-	background-image: url(:/res/styles/vintage/bg.png);
-	min-width:800px;
-	min-height:582px;
-	
-}
-
-QLabel, QCheckBox {
-	color: #FFF;
-	font: 8pt "Arial";	
-}
-
-QGroupBox{
-	border:none;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-}
-
-QGroupBox::title {
-	color: #F7B754;	
-}
-
-QTextBrowser {
-	border:none;
-}
-
-
-QPushButton {
-	border-image: url(:/res/styles/vintage/button2.png) 0 0 0 0 stretch stretch;
-	color: #EFE1AF;/*#F8E600*/
-	font: 12pt "Segoe Print";
-	padding:5px;
-}
-
-QPushButton:hover { color: #F9EA20; }
-QPushButton:pressed { background-color: transparent; }
-QPushButton:hover:!pressed{ border: 1px solid red; }
- 
-QPushButton#enterButton { border-image: url(:/res/styles/vintage/enter.png) 0 0 0 0 stretch stretch; }  
-QPushButton#enterButton:hover { border-image: url(:/res/styles/vintage/enter_hover.png) 0 0 0 0 stretch stretch; } 
- 
-QLabel#titleLabel {
-	color: #ECE7C4; /*#FBB540*/
-	font: 14pt "Segoe Script";
-	font-weight:bold;	 
-}
- 
- 
-QLabel#hintLabel{
-	color: #FBB540;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-} 
- 
-QLabel#hintLabel, QLabel#news1Title, QLabel#news2Title, QLabel#news3Title , QLabel#news4Title{
-	color: #F7B754;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-	text-decoration:none;
-}
-
-QLabel#news1Image, QLabel#news2Image, QLabel#news3Image , QLabel#news4Image{
-	border-image: url(:/res/styles/vintage/plane.png);
-	padding:3px;
-}
-
- QLabel#exthintLabel{
-	color: rgb(255, 255, 255);
-	font: 8pt "Arial";	 
- }  
- 
- QLabel#textsTitle, QLabel#imagesTitle, QLabel#soundsTitle, QLabel#loadscreensTitle, QLabel#fontsTitle, QLabel#videosTitle{
-	color: #F7B754;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
- }  
- 
-QLabel#textsStatus, QLabel#imagesStatus, QLabel#soundsStatus, QLabel#loadscreensStatus, QLabel#fontsStatus, QLabel#videosStatus{
-	color: #FFF;
-	font: 10pt "TrebushetMS";
-}   
- 
-QPushButton#lotropathButton{
-	font: 10pt "MS Shell Dlg 2";
-	color: rgb(255, 255, 255);
-	border-image: url(:/res/styles/vintage/folder.png);
-	
-} 
-
-QLabel#mainboxImage{ border-image: url(:/res/styles/vintage/gandalf.png); } 
-QLabel#optboxImage{ border-image: url(:/res/styles/vintage/boromir.png); }  
-QLabel#newsboxImage{ border-image: url(:/res/styles/vintage/saruman.png); }
-QLabel#helpboxImage{ border-image: url(:/res/styles/vintage/elrond.png); }  
-QLabel#aboutboxImage{ border-image: url(:/res/styles/vintage/eowin.png); }
-  
-
-QTextBrowser {
-	background:transparent;
-	color:#FFF;
-	font: 10pt "TrebushetMS";	
-}
-
- QLabel#programmers, QLabel#designers, QLabel#translators, QLabel#helpers, QLabel#moderators{
-	color: #F7B754;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
- } 
-
-QLabel#skinLabel{
-	color: #F7B754;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-} 
-
-QPushButton#minimizeButton { border-image: url(:/res/styles/vintage/minimize.png) 0 0 0 0 stretch stretch; }
-QPushButton#closeButton { border-image: url(:/res/styles/vintage/close.png) 0 0 0 0 stretch stretch; }
-
-/*QMessageBox {
-	background:transparent;
-	border-image: url(:/res/styles/vintage/message.png);
-	color: #F7B754;
-	font: 11pt "TrebushetMS";
-	
-	
-}
-
-QMessageBox QLabel {
-    color: #FFF;font: 9pt "TrebushetMS";
-	background-color:rgba(0,0,0,0.4);
-	padding:7px;
-	margin-top:30px;
-}
-
-
-QMessageBox QPushButton {
-	border-image: url(:/res/styles/vintage/msgbutton.png);
-	min-width:50px;
-	max-height:24px;
-}*/
-
-QGroupBox#dialogbox{
-	background:rgba(0,0,0,0.4);
-}
-
-QGroupBox#dialog{
-	border-image: url(:/res/styles/vintage/start_window.png);
-}
-
-QGroupBox QLabel#dialogHeader{
-	border-image: url(:/res/styles/vintage/window_header_brown.png);
-	padding-left:7px;
-	color: #F2DA84;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-	margin-left:5px;
-	margin-right:5px;
-	margin-top:3px;
-}
-
-QGroupBox QLabel#dialogImage{ margin:3px; }
-
-QGroupBox QLabel#dialogInfo{	
-	margin:7px;
-	padding:7px;
-	font: 10pt "TrebushetMS";
-	color:#333;
-	/*background-color:rgba(0,0,0,0.3)*/
-}
-
-QPushButton#okButton, QPushButton#cancelButton { margin-top:7px; }
-
-QLabel#Arkenstone, QLabel#Belegaer, QLabel#Brandywine, QLabel#Crickhollow, QLabel#Evernight, QLabel#Gladden, QLabel#Gwaihir,
-QLabel#Lamannia, QLabel#Landroval, QLabel#Laurelin, QLabel#Sirannon, QLabel#Bullroarer, QLabel#Crickhollow { 
-	border-image: url(:/res/styles/vintage/plane2.png);
-	background-color: #555555; /*#8A0808 #173B0B*/
-}
-
-QPushButton#couponButton{
-	font: 14pt "MS Shell Dlg 2";
-	color: #FFFFE6;
-	border-image: none;
-	background:transparent;
-	font-weight:bold;
-	
-} 
-
-QPushButton#couponButton:hover{ border:none; } 
-
-QLabel#couponTitle{	color: #FFFFE6;font-weight:bold;}
-QLabel#lotropathLabel{ border:#BFBFBF solid 1px;border-width: 1px; background-color:rgba(19,0,0,0.25); padding-left:2px; }
-QLabel#footRed{	color: red;font-weight:bold;}
-QLabel#footYellow{	color: #FFDC20;font-weight:bold;}
-QLabel#loader{ background:transparent;}
-
-QPushButton#enButton{ border-image: url(:/res/styles/vintage/flag_en.png) 0 0 0 0 stretch stretch;} 
-QPushButton#deButton{ border-image: url(:/res/styles/vintage/flag_de.png) 0 0 0 0 stretch stretch;}
-QPushButton#frButton{ border-image: url(:/res/styles/vintage/flag_fr.png) 0 0 0 0 stretch stretch;}
-QPushButton#enButton:disabled, QPushButton#deButton:disabled, QPushButton#frButton:disabled{border-width: 1px; background-color: rgba(255,255,255,0.4);} 
-
-
-QComboBox, QListView::item:selected{
-	color:#FFFFFF;
-	background-color:rgba(0,0,0,0.1);
-	padding:1px;
-	subcontrol-origin: padding;
-}
-
-QComboBox::drop-down{border-width:1px;}
-QComboBox::down-arrow{border-image:url(:/res/styles/vintage/downarrow.png);}
-QComboBox QAbstractItemView::item{ padding:5px; }
-
-QPushButton#goCancel{ border-image: url(:/res/styles/vintage/gocancel.png) 0 0 0 0 stretch stretch;}
-QPushButton#goLocal{ border-image: url(:/res/styles/vintage/gorur.png) 0 0 0 0 stretch stretch;}
-QPushButton#goEnButton{ border-image: url(:/res/styles/vintage/goenr.png) 0 0 0 0 stretch stretch;}
-QPushButton#goDeButton{ border-image: url(:/res/styles/vintage/goder.png) 0 0 0 0 stretch stretch;}
-QPushButton#goFrButton{ border-image: url(:/res/styles/vintage/gofrr.png) 0 0 0 0 stretch stretch;}
-
-QGroupBox#startbox{
-	background:rgba(0,0,0,0.4);
-}
-
-QGroupBox#startframe{
-	background:rgba(0,0,0,0.4);
-	border-image: url(:/res/styles/vintage/start_window.png) 0 0 0 0 stretch stretch;
-}
-
-QGroupBox#startframe QLabel#goTitle{
-	/*border-image: url(:/res/styles/vintage/header.png);*/
-	color: #4B2708;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-}
-
-QGroupBox#startframe QLabel#goHeader{
-	border-image: url(:/res/styles/vintage/window_header_brown.png) 0 0 0 0 stretch stretch;
-	padding-left:7px;
-	color: #F2DA84;
-	font: 11pt "TrebushetMS";
-	font-weight:bold;
-	margin-left:5px;
-	margin-right:5px;
-	margin-top:3px;
-}
-
-QLabel#goHint{ color:#4B2708; }
-
-

ui_mainwindow.h

@@ -151,7 +151,7 @@ public:
     {
         if (MainWindow->objectName().isEmpty())
             MainWindow->setObjectName(QStringLiteral("MainWindow"));
-        MainWindow->resize(513, 345);
+        MainWindow->resize(427, 310);
         MainWindow->setStyleSheet(QStringLiteral(""));
         centralWidget = new QWidget(MainWindow);
         centralWidget->setObjectName(QStringLiteral("centralWidget"));
@@ -213,22 +213,22 @@ public:
         videosTitle->setGeometry(QRect(10, 180, 111, 21));
         textsStatus = new QLabel(mainbox);
         textsStatus->setObjectName(QStringLiteral("textsStatus"));
-        textsStatus->setGeometry(QRect(210, 5, 131, 35));
+        textsStatus->setGeometry(QRect(200, 5, 131, 35));
         soundsStatus = new QLabel(mainbox);
         soundsStatus->setObjectName(QStringLiteral("soundsStatus"));
-        soundsStatus->setGeometry(QRect(210, 40, 131, 35));
+        soundsStatus->setGeometry(QRect(200, 40, 131, 35));
         imagesStatus = new QLabel(mainbox);
         imagesStatus->setObjectName(QStringLiteral("imagesStatus"));
-        imagesStatus->setGeometry(QRect(210, 75, 131, 35));
+        imagesStatus->setGeometry(QRect(200, 75, 131, 35));
         loadscreensStatus = new QLabel(mainbox);
         loadscreensStatus->setObjectName(QStringLiteral("loadscreensStatus"));
-        loadscreensStatus->setGeometry(QRect(210, 110, 131, 35));
+        loadscreensStatus->setGeometry(QRect(200, 110, 131, 35));
         fontsStatus = new QLabel(mainbox);
         fontsStatus->setObjectName(QStringLiteral("fontsStatus"));
-        fontsStatus->setGeometry(QRect(210, 145, 131, 35));
+        fontsStatus->setGeometry(QRect(200, 145, 131, 35));
         videosStatus = new QLabel(mainbox);
         videosStatus->setObjectName(QStringLiteral("videosStatus"));
-        videosStatus->setGeometry(QRect(210, 180, 121, 35));
+        videosStatus->setGeometry(QRect(200, 180, 121, 35));
         label_3 = new QLabel(mainbox);
         label_3->setObjectName(QStringLiteral("label_3"));
         label_3->setGeometry(QRect(10, 23, 221, 16));
@@ -404,34 +404,34 @@ public:
         aboutbox->setFlat(false);
         helperslist = new QLabel(aboutbox);
         helperslist->setObjectName(QStringLiteral("helperslist"));
-        helperslist->setGeometry(QRect(10, 162, 371, 31));
-        helperslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+        helperslist->setGeometry(QRect(10, 182, 371, 31));
+        helperslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
         helperslist->setWordWrap(true);
         designers = new QLabel(aboutbox);
         designers->setObjectName(QStringLiteral("designers"));
         designers->setGeometry(QRect(10, 40, 361, 21));
         translatorslist = new QLabel(aboutbox);
         translatorslist->setObjectName(QStringLiteral("translatorslist"));
-        translatorslist->setGeometry(QRect(10, 106, 371, 31));
-        translatorslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+        translatorslist->setGeometry(QRect(10, 100, 371, 65));
+        translatorslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
         translatorslist->setWordWrap(true);
         programmerslist = new QLabel(aboutbox);
         programmerslist->setObjectName(QStringLiteral("programmerslist"));
         programmerslist->setGeometry(QRect(10, 19, 361, 16));
-        programmerslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+        programmerslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
         programmers = new QLabel(aboutbox);
         programmers->setObjectName(QStringLiteral("programmers"));
         programmers->setGeometry(QRect(10, 0, 361, 21));
         helpers = new QLabel(aboutbox);
         helpers->setObjectName(QStringLiteral("helpers"));
-        helpers->setGeometry(QRect(10, 145, 366, 21));
+        helpers->setGeometry(QRect(10, 165, 366, 21));
         designerslist = new QLabel(aboutbox);
         designerslist->setObjectName(QStringLiteral("designerslist"));
         designerslist->setGeometry(QRect(10, 59, 361, 16));
-        designerslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+        designerslist->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
         translators = new QLabel(aboutbox);
         translators->setObjectName(QStringLiteral("translators"));
-        translators->setGeometry(QRect(10, 85, 361, 21));
+        translators->setGeometry(QRect(10, 80, 361, 21));
         helpboxImage = new QLabel(centralWidget);
         helpboxImage->setObjectName(QStringLiteral("helpboxImage"));
         helpboxImage->setGeometry(QRect(20, 330, 47, 21));
@@ -692,11 +692,11 @@ public:
         helpbox->setTitle(QString());
         aboutbox->setTitle(QString());
         helperslist->setText(QApplication::translate("MainWindow", "TextLabel", Q_NULLPTR));
-        designers->setText(QApplication::translate("MainWindow", "\320\224\320\270\320\267\320\260\320\271\320\275 \320\270 \321\200\320\260\320\261\320\276\321\202\320\260 \321\201 \320\263\321\200\320\260\321\204\320\270\320\272\320\276\320\271", Q_NULLPTR));
+        designers->setText(QApplication::translate("MainWindow", "\320\224\320\270\320\267\320\260\320\271\320\275 \320\270 \321\200\320\260\320\261\320\276\321\202\320\260 \321\201 \320\263\321\200\320\260\321\204\320\270\320\272\320\276\320\271:", Q_NULLPTR));
         translatorslist->setText(QApplication::translate("MainWindow", "TextLabel", Q_NULLPTR));
         programmerslist->setText(QApplication::translate("MainWindow", "TextLabel", Q_NULLPTR));
-        programmers->setText(QApplication::translate("MainWindow", "\320\242\320\265\321\205\320\275\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \320\270 \320\277\321\200\320\276\320\263\321\200\320\260\320\274\320\274\320\275\320\260\321\217 \321\207\320\260\321\201\321\202\321\214", Q_NULLPTR));
-        helpers->setText(QApplication::translate("MainWindow", "\320\237\320\276\320\274\320\276\320\263\320\260\320\273\320\270 \321\201\320\273\320\276\320\262\320\276\320\274 \320\270 \320\264\320\265\320\273\320\276\320\274", Q_NULLPTR));
+        programmers->setText(QApplication::translate("MainWindow", "\320\242\320\265\321\205\320\275\320\270\321\207\320\265\321\201\320\272\320\260\321\217 \320\270 \320\277\321\200\320\276\320\263\321\200\320\260\320\274\320\274\320\275\320\260\321\217 \321\207\320\260\321\201\321\202\321\214:", Q_NULLPTR));
+        helpers->setText(QApplication::translate("MainWindow", "\320\237\320\276\320\274\320\276\320\263\320\260\320\273\320\270 \321\201\320\273\320\276\320\262\320\276\320\274 \320\270 \320\264\320\265\320\273\320\276\320\274:", Q_NULLPTR));
         designerslist->setText(QApplication::translate("MainWindow", "TextLabel", Q_NULLPTR));
         translators->setText(QApplication::translate("MainWindow", "\320\237\321\200\320\270\320\275\320\270\320\274\320\260\321\216\321\202 \321\203\321\207\320\260\321\201\321\202\320\270\320\265 \320\262 \320\277\320\265\321\200\320\265\320\262\320\276\320\264\320\265:", Q_NULLPTR));
         helpboxImage->setText(QString());
@@ -735,7 +735,7 @@ public:
         goTitle->setText(QApplication::translate("MainWindow", "\320\222\320\276 \321\207\321\202\320\276 \320\261\321\203\320\264\320\265\320\274 \320\270\320\263\321\200\320\260\321\202\321\214 \321\201\320\265\320\263\320\276\320\264\320\275\321\217?", Q_NULLPTR));
         goHeader->setText(QApplication::translate("MainWindow", "\320\227\320\260\320\277\321\203\321\201\320\272 \320\270\320\263\321\200\321\213", Q_NULLPTR));
         goHint->setText(QApplication::translate("MainWindow", "\320\237\320\276\320\264\320\263\320\276\321\202\320\276\320\262\320\272\320\260 \321\204\320\260\320\271\320\273\320\276\320\262 \320\273\320\276\320\272\320\260\320\273\320\270\320\267\320\260\321\206\320\270\320\270 ...", Q_NULLPTR));
-        labelVersion->setText(QApplication::translate("MainWindow", "\320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265: v2.0.0", Q_NULLPTR));
+        labelVersion->setText(QApplication::translate("MainWindow", "\320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265: v1.1.0", Q_NULLPTR));
         designButton->setText(QApplication::translate("MainWindow", "\320\236\320\261\320\275\320\276\320\262\320\270\321\202\321\214", Q_NULLPTR));
         mainTitle->setText(QApplication::translate("MainWindow", "\320\222\320\273\320\260\321\201\321\202\320\265\320\273\320\270\320\275 \320\272\320\276\320\273\320\265\321\206 \320\236\320\275\320\273\320\260\320\271\320\275: \320\235\320\260\321\201\320\273\320\265\320\264\320\270\320\265", Q_NULLPTR));
     } // retranslateUi