提交: 80be1253b80c91179433fa362f3848e1388ba2f0 - FFU-Eng (git)

Commit MetaInfo

• 修订版: 80be1253b80c91179433fa362f3848e1388ba2f0 (tree)
• 时间: 2014-04-11 22:03:05
• 作者: jakago <jakago777@gmai...>
• Commiter: jakago

Log Message

GUI変更中

更改概述

• modified: customizedialog.ui
• modified: mainwindow.cpp
• modified: stylesheet.qss

差异

--- a/customizedialog.ui
+++ b/customizedialog.ui
@@ -31,12 +31,24 @@
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>200</x>
+     <x>340</x>
      <y>570</y>
-     <width>341</width>
+     <width>201</width>
      <height>32</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>0</height>
+    </size>
+   </property>
    <property name="orientation">
     <enum>Qt::Horizontal</enum>
    </property>
@@ -50,7 +62,7 @@
      <x>10</x>
      <y>253</y>
      <width>527</width>
-     <height>311</height>
+     <height>312</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">

--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,6 +51,7 @@
 #define SCRAMBLE_URL1 "http://www47.atwiki.jp/jakago/pub/scramble.xml"
 #define SCRAMBLE_URL2 "http://cdn47.atwikiimg.com/jakago/pub/scramble.xml"
 #define X11_WINDOW_VERTICAL_INCREMENT 5
+#define STYLE_SHEET "stylesheet.qss"
 
 namespace {
 	bool outputDirSpecified = false;
@@ -124,9 +125,16 @@ MainWindow::MainWindow( QWidget *parent )
 	//connect( action, SIGNAL( triggered() ), this, SLOT( customizeScramble() ) );
 	//customizeMenu->addAction( action );
 
-	QFile file(":/default.qss");
-	file.open(QFile::ReadOnly);
-	QString styleSheet = QLatin1String(file.readAll());
+	QString styleSheet;
+	QFile real( Utility::applicationBundlePath() + STYLE_SHEET );
+	if ( real.exists() ) {
+		real.open( QFile::ReadOnly );
+		styleSheet = QLatin1String( real.readAll() );
+	} else {
+		QFile res( QString( ":/" ) + STYLE_SHEET );
+		res.open( QFile::ReadOnly );
+		styleSheet = QLatin1String( res.readAll() );
+	}
 	qApp->setStyleSheet( styleSheet );
 }
 

--- a/stylesheet.qss
+++ b/stylesheet.qss
@@ -1,7 +1,11 @@
 QWidget {
 	background-color: gainsboro;
-	/*background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde);*/
-	/*color: #e7e7eb;*/
+	/*
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 whitesmoke, stop: 1 silver);
+	*/
+	/*
+	color: #e7e7eb;
+	*/
 }
 
 QMenuBar {
@@ -20,25 +24,18 @@ QMenuBar::item:pressed {
 	background: #888888;
 }
 
-/*
-QPlainTextEdit {
-	background-color: lightsteelblue;
-}
-*/
-
 QPushButton {
-	/*background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde);*/
 	background-color: gainsboro;
+	/*
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 whitesmoke, stop: 1 silver);
+	*/
 	border-top: 1px solid white;
 	border-left: 1px solid white;
 	border-right: 2px solid dimgray;
 	border-bottom: 2px solid dimgray;
 	border-radius: 10px;
-	/*
-	padding: 3px;
-	min-width: 9ex;
-	min-height: 2.5ex;
-	*/
+	min-width: 12ex;
+	min-height: 3ex;
 }
 
 /*