satisfy cppcheck; some gui improvement for 800x480
This commit is contained in:
@@ -146,7 +146,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string notr="true">QObject {font: bold 18px}</string>
|
<string notr="true">QObject {font: bold 18px}</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_1">
|
<widget class="QWidget" name="tab_1">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
|
|||||||
@@ -149,7 +149,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QStackedWidget" name="stackedWidget">
|
<widget class="QStackedWidget" name="stackedWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>7</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="page">
|
<widget class="QWidget" name="page">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
@@ -3811,7 +3811,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<number>1</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>7</number>
|
<number>3650</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="value">
|
<property name="value">
|
||||||
<number>2</number>
|
<number>2</number>
|
||||||
@@ -3927,6 +3927,9 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="alternatingRowColors">
|
<property name="alternatingRowColors">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="selectionMode">
|
||||||
|
<enum>QAbstractItemView::ExtendedSelection</enum>
|
||||||
|
</property>
|
||||||
<property name="indentation">
|
<property name="indentation">
|
||||||
<number>5</number>
|
<number>5</number>
|
||||||
</property>
|
</property>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
<enum>Qt::NoFocus</enum>
|
<enum>Qt::NoFocus</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>3</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_Hands">
|
<widget class="QWidget" name="tab_Hands">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@@ -126,6 +126,9 @@
|
|||||||
<property name="horizontalScrollBarPolicy">
|
<property name="horizontalScrollBarPolicy">
|
||||||
<enum>Qt::ScrollBarAlwaysOff</enum>
|
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
@@ -765,11 +768,6 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
|
||||||
<class>Slider</class>
|
|
||||||
<extends>QSlider</extends>
|
|
||||||
<header>myslider.h</header>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>MyLeftTabWidget</class>
|
<class>MyLeftTabWidget</class>
|
||||||
<extends>QTabWidget</extends>
|
<extends>QTabWidget</extends>
|
||||||
@@ -787,6 +785,11 @@
|
|||||||
<extends>QLabel</extends>
|
<extends>QLabel</extends>
|
||||||
<header>mychancelabel.h</header>
|
<header>mychancelabel.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
|
<customwidget>
|
||||||
|
<class>Slider</class>
|
||||||
|
<extends>QSlider</extends>
|
||||||
|
<header>myslider.h</header>
|
||||||
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<connections>
|
||||||
|
|||||||
@@ -1566,10 +1566,10 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
|
|||||||
gt->setMaximumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
|
gt->setMaximumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
|
||||||
gt->resize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
|
gt->resize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
|
||||||
|
|
||||||
|
#ifndef GUI_800x480
|
||||||
QDesktopWidget dw;
|
QDesktopWidget dw;
|
||||||
int availableWidth = dw.screenGeometry().width();
|
int availableWidth = dw.screenGeometry().width();
|
||||||
int availableHeight = dw.screenGeometry().height();
|
int availableHeight = dw.screenGeometry().height();
|
||||||
#ifndef GUI_800x480
|
|
||||||
if(availableWidth == FixedWindowWidth.toInt() && availableHeight == FixedWindowHeight.toInt()) {
|
if(availableWidth == FixedWindowWidth.toInt() && availableHeight == FixedWindowHeight.toInt()) {
|
||||||
gt->actionFullScreen->setEnabled(TRUE);
|
gt->actionFullScreen->setEnabled(TRUE);
|
||||||
} else {
|
} else {
|
||||||
@@ -1585,10 +1585,10 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
|
|||||||
gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt());
|
gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt());
|
||||||
gt->resize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
|
gt->resize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
|
||||||
|
|
||||||
|
#ifndef GUI_800x480
|
||||||
QDesktopWidget dw;
|
QDesktopWidget dw;
|
||||||
int availableWidth = dw.screenGeometry().width();
|
int availableWidth = dw.screenGeometry().width();
|
||||||
int availableHeight = dw.screenGeometry().height();
|
int availableHeight = dw.screenGeometry().height();
|
||||||
#ifndef GUI_800x480
|
|
||||||
if(availableWidth <= MaximumWindowWidth.toInt() && availableHeight <= MaximumWindowHeight.toInt()) {
|
if(availableWidth <= MaximumWindowWidth.toInt() && availableHeight <= MaximumWindowHeight.toInt()) {
|
||||||
gt->actionFullScreen->setEnabled(TRUE);
|
gt->actionFullScreen->setEnabled(TRUE);
|
||||||
} else {
|
} else {
|
||||||
@@ -1609,7 +1609,7 @@ void GameTableStyleReader::setSliderStyle(QSlider *s)
|
|||||||
QString height("");
|
QString height("");
|
||||||
|
|
||||||
#ifdef GUI_800x480
|
#ifdef GUI_800x480
|
||||||
height = " height: 8px;";
|
height = " height: 10px;";
|
||||||
#else
|
#else
|
||||||
height = " height: 3px;";
|
height = " height: 3px;";
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user