diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/downloadlistwidget.cpp | 1 | ||||
| -rw-r--r-- | src/mainwindow.ui | 262 | ||||
| -rw-r--r-- | src/moapplication.cpp | 6 | ||||
| -rw-r--r-- | src/modlist.cpp | 5 | ||||
| -rw-r--r-- | src/pluginlist.cpp | 5 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark-Green.qss | 13 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark-Orange.qss | 15 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark-Purple.qss | 15 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark-Red.qss | 15 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark-Yellow.qss | 16 | ||||
| -rw-r--r-- | src/stylesheets/vs15 Dark.qss | 13 |
11 files changed, 101 insertions, 265 deletions
diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp index ac37b0ee..5ca6cb51 100644 --- a/src/downloadlistwidget.cpp +++ b/src/downloadlistwidget.cpp @@ -103,6 +103,7 @@ DownloadListWidget::DownloadListWidget(QWidget *parent) {
setHeader(new DownloadListHeader(Qt::Horizontal, this));
+ header()->setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
header()->setSectionsMovable(true);
header()->setContextMenuPolicy(Qt::CustomContextMenu);
header()->setCascadingSectionResizes(true);
diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 8bd22ff1..acf6767f 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>926</width> + <width>1009</width> <height>710</height> </rect> </property> @@ -97,12 +97,6 @@ <property name="allColumnsShowFocus"> <bool>true</bool> </property> - <property name="headerHidden"> - <bool>true</bool> - </property> - <attribute name="headerVisible"> - <bool>true</bool> - </attribute> <attribute name="headerCascadingSectionResizes"> <bool>false</bool> </attribute> @@ -781,22 +775,16 @@ p, li { white-space: pre-wrap; } <string>Plugins</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_4"> - <property name="leftMargin"> - <number>6</number> - </property> - <property name="topMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>6</number> - </property> - <property name="bottomMargin"> - <number>0</number> - </property> <item> <layout class="QHBoxLayout" name="horizontalLayout_7"> <item> <widget class="QPushButton" name="bossButton"> + <property name="toolTip"> + <string>Sort the plugins using LOOT.</string> + </property> + <property name="whatsThis"> + <string>Sort the plugins using LOOT.</string> + </property> <property name="text"> <string>Sort</string> </property> @@ -807,22 +795,28 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <widget class="MOBase::LineEditClear" name="espFilterEdit"> + <property name="toolTip"> + <string>Filter the list of plugins.</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> + <property name="whatsThis"> + <string>Filter the list of plugins.</string> </property> - </spacer> + <property name="text"> + <string/> + </property> + <property name="placeholderText"> + <string>Filter</string> + </property> + </widget> </item> <item> <widget class="QPushButton" name="restoreButton"> <property name="toolTip"> - <string>Restore Backup...</string> + <string>Restore a backup.</string> + </property> + <property name="whatsThis"> + <string>Restore a backup.</string> </property> <property name="text"> <string notr="true"/> @@ -842,7 +836,10 @@ p, li { white-space: pre-wrap; } <item> <widget class="QPushButton" name="saveButton"> <property name="toolTip"> - <string>Create Backup</string> + <string>Create a backup.</string> + </property> + <property name="whatsThis"> + <string>Create a backup.</string> </property> <property name="text"> <string notr="true"/> @@ -869,7 +866,7 @@ p, li { white-space: pre-wrap; } </size> </property> <property name="whatsThis"> - <string>This provides statistics about the plugin list. The total number of active plugins is normally displayed. Other statistics may be accessed with the tooltip of this counter.</string> + <string><html><head/><body><p>This provides statistics about the plugin list. The total number of active plugins is normally displayed. Other statistics may be accessed with the tooltip of this counter.</p></body></html></string> </property> <property name="frameShadow"> <enum>QFrame::Sunken</enum> @@ -896,14 +893,10 @@ p, li { white-space: pre-wrap; } <enum>Qt::CustomContextMenu</enum> </property> <property name="toolTip"> - <string>List of available esp/esm files</string> + <string>List of available esp/esm files.</string> </property> <property name="whatsThis"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">This list contains the esps, esms, and esls contained in the active mods. These require their own load order. Use drag&amp;drop to modify this load order. Please note that MO will only save the load order for mods that are active/checked.<br />There is a great tool named &quot;BOSS&quot; to automatically sort these files.</span></p></body></html></string> + <string>List of available esp/esm files.</string> </property> <property name="editTriggers"> <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set> @@ -949,20 +942,6 @@ p, li { white-space: pre-wrap; } </attribute> </widget> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="MOBase::LineEditClear" name="espFilterEdit"> - <property name="text"> - <string/> - </property> - <property name="placeholderText"> - <string>Filter</string> - </property> - </widget> - </item> - </layout> - </item> </layout> </widget> <widget class="QWidget" name="bsaTab"> @@ -973,18 +952,6 @@ p, li { white-space: pre-wrap; } <string>Archives</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_9"> - <property name="leftMargin"> - <number>6</number> - </property> - <property name="topMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>6</number> - </property> - <property name="bottomMargin"> - <number>6</number> - </property> <item> <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0"> <item> @@ -1043,27 +1010,15 @@ p, li { white-space: pre-wrap; } <string>Data</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_5"> - <property name="leftMargin"> - <number>6</number> - </property> - <property name="topMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>6</number> - </property> - <property name="bottomMargin"> - <number>6</number> - </property> <item> <layout class="QHBoxLayout" name="horizontalLayout_12"> <item> <widget class="QPushButton" name="dataTabRefresh"> <property name="toolTip"> - <string>refresh data-directory overview</string> + <string>Refresh the data structure.</string> </property> <property name="whatsThis"> - <string>Refresh the overview. This may take a moment.</string> + <string>Refresh the data structure.</string> </property> <property name="text"> <string>Refresh</string> @@ -1075,44 +1030,41 @@ p, li { white-space: pre-wrap; } </widget> </item> <item> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <widget class="QLineEdit" name="dataTabFilter"> + <property name="toolTip"> + <string>Filter the Data tree.</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> + <property name="whatsThis"> + <string>Filter the Data tree.</string> </property> - </spacer> + </widget> </item> <item> <widget class="QCheckBox" name="dataTabShowOnlyConflicts"> <property name="toolTip"> - <string>Filters the above list so that only conflicts are displayed.</string> + <string>Filter the list so that only conflicts are displayed.</string> </property> <property name="whatsThis"> - <string>Filters the above list so that only conflicts are displayed.</string> + <string>Filter the list so that only conflicts are displayed.</string> </property> <property name="text"> - <string>Show only conflicts</string> + <string>Conflicts only</string> </property> </widget> </item> <item> <widget class="QCheckBox" name="dataTabShowFromArchives"> <property name="toolTip"> - <string>Filters the above list so that files from archives are not shown</string> + <string>Filter the list so that files from archives are shown.</string> </property> <property name="statusTip"> <string/> </property> <property name="whatsThis"> - <string>Filters the above list so that files from archives are not shown</string> + <string>Filter the list so that files from archives are shown.</string> </property> <property name="text"> - <string>Show files from Archives</string> + <string>Archives</string> </property> </widget> </item> @@ -1147,13 +1099,6 @@ p, li { white-space: pre-wrap; } </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="dataTreeFilterBox"> - <item> - <widget class="QLineEdit" name="dataTabFilter"/> - </item> - </layout> - </item> </layout> </widget> <widget class="QWidget" name="savesTab"> @@ -1161,18 +1106,6 @@ p, li { white-space: pre-wrap; } <string>Saves</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_3"> - <property name="leftMargin"> - <number>6</number> - </property> - <property name="topMargin"> - <number>6</number> - </property> - <property name="rightMargin"> - <number>6</number> - </property> - <property name="bottomMargin"> - <number>6</number> - </property> <item> <widget class="QListWidget" name="savegameList"> <property name="contextMenuPolicy"> @@ -1208,31 +1141,52 @@ p, li { white-space: pre-wrap; } <string>Downloads</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_7"> - <property name="leftMargin"> - <number>2</number> - </property> - <property name="topMargin"> - <number>2</number> - </property> - <property name="rightMargin"> - <number>2</number> - </property> - <property name="bottomMargin"> - <number>2</number> - </property> <item> - <widget class="QPushButton" name="btnRefreshDownloads"> - <property name="toolTip"> - <string>Refresh downloads view</string> - </property> - <property name="text"> - <string>Refresh</string> - </property> - <property name="icon"> - <iconset resource="resources.qrc"> - <normaloff>:/MO/gui/resources/view-refresh.png</normaloff>:/MO/gui/resources/view-refresh.png</iconset> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0"> + <item> + <widget class="QPushButton" name="btnRefreshDownloads"> + <property name="toolTip"> + <string>Refresh the downloads.</string> + </property> + <property name="whatsThis"> + <string>Refresh the downloads.</string> + </property> + <property name="text"> + <string>Refresh</string> + </property> + <property name="icon"> + <iconset resource="resources.qrc"> + <normaloff>:/MO/gui/resources/view-refresh.png</normaloff>:/MO/gui/resources/view-refresh.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="MOBase::LineEditClear" name="downloadFilterEdit"> + <property name="toolTip"> + <string>Filter the list of downloads.</string> + </property> + <property name="whatsThis"> + <string>Filter the list of downloads.</string> + </property> + <property name="placeholderText"> + <string>Filter</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="showHiddenBox"> + <property name="toolTip"> + <string>Show downloads marked as hidden.</string> + </property> + <property name="whatsThis"> + <string>Show downloads marked as hidden.</string> + </property> + <property name="text"> + <string>Hidden files</string> + </property> + </widget> + </item> + </layout> </item> <item> <layout class="QVBoxLayout" name="downloadLayout"> @@ -1256,9 +1210,6 @@ p, li { white-space: pre-wrap; } <property name="whatsThis"> <string>This is a list of mods you downloaded from Nexus. Double click one to install it. You can also drag an archive into here.</string> </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOn</enum> - </property> <property name="dragEnabled"> <bool>true</bool> </property> @@ -1287,37 +1238,6 @@ p, li { white-space: pre-wrap; } </item> </layout> </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,2"> - <item> - <widget class="QCheckBox" name="showHiddenBox"> - <property name="text"> - <string>Show Hidden</string> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_3"> - <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="MOBase::LineEditClear" name="downloadFilterEdit"> - <property name="placeholderText"> - <string>Filter</string> - </property> - </widget> - </item> - </layout> - </item> </layout> </widget> </widget> @@ -1370,8 +1290,8 @@ p, li { white-space: pre-wrap; } <rect> <x>0</x> <y>0</y> - <width>926</width> - <height>21</height> + <width>1009</width> + <height>22</height> </rect> </property> <widget class="QMenu" name="menuFile"> diff --git a/src/moapplication.cpp b/src/moapplication.cpp index a071d58b..2fb12809 100644 --- a/src/moapplication.cpp +++ b/src/moapplication.cpp @@ -80,7 +80,11 @@ public: MOApplication::MOApplication(int &argc, char **argv)
: QApplication(argc, argv)
{
- connect(&m_StyleWatcher, SIGNAL(fileChanged(QString)), SLOT(updateStyle(QString)));
+ connect(&m_StyleWatcher, &QFileSystemWatcher::fileChanged, [&](auto&& file){
+ log::debug("style file '{}' changed, reloading", file);
+ updateStyle(file);
+ });
+
m_DefaultStyle = style()->objectName();
setStyle(new ProxyStyle(style()));
}
diff --git a/src/modlist.cpp b/src/modlist.cpp index c0f18821..31eb8387 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -676,11 +676,6 @@ QVariant ModList::headerData(int section, Qt::Orientation orientation, return getColumnToolTip(section); } else if (role == Qt::TextAlignmentRole) { return QVariant(Qt::AlignCenter); - } else if (role == Qt::SizeHintRole) { - QSize temp = m_FontMetrics.size(Qt::TextSingleLine, getColumnName(section)); - temp.rwidth() += 20; - temp.rheight() += 12; - return temp; } } return QAbstractItemModel::headerData(section, orientation, role); diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 3f2f4018..266fe35c 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -1315,11 +1315,6 @@ QVariant PluginList::headerData(int section, Qt::Orientation orientation, return getColumnName(section);
} else if (role == Qt::ToolTipRole) {
return getColumnToolTip(section);
- } else if (role == Qt::SizeHintRole) {
- QSize temp = m_FontMetrics.size(Qt::TextSingleLine, getColumnName(section));
- temp.rwidth() += 25;
- temp.rheight() += 12;
- return temp;
}
}
return QAbstractItemModel::headerData(section, orientation, role);
diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss index 6d95c6cc..0a3150ad 100644 --- a/src/stylesheets/vs15 Dark-Green.qss +++ b/src/stylesheets/vs15 Dark-Green.qss @@ -692,19 +692,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss index 2dd27df4..0e1d96b1 100644 --- a/src/stylesheets/vs15 Dark-Orange.qss +++ b/src/stylesheets/vs15 Dark-Orange.qss @@ -603,7 +603,7 @@ SaveGameInfoWidget { border-width: 1px; padding: 2px; } - QStatusBar::item {border: None;} +QStatusBar::item {border: None;} /* Progress Bars (Downloads) #QProgressBar */ QProgressBar { @@ -693,19 +693,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss index 116aaa7d..c19d188b 100644 --- a/src/stylesheets/vs15 Dark-Purple.qss +++ b/src/stylesheets/vs15 Dark-Purple.qss @@ -603,7 +603,7 @@ SaveGameInfoWidget { border-width: 1px; padding: 2px; } - QStatusBar::item {border: None;} +QStatusBar::item {border: None;} /* Progress Bars (Downloads) #QProgressBar */ QProgressBar { @@ -693,19 +693,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss index 60f565a1..a6221dff 100644 --- a/src/stylesheets/vs15 Dark-Red.qss +++ b/src/stylesheets/vs15 Dark-Red.qss @@ -603,7 +603,7 @@ SaveGameInfoWidget { border-width: 1px; padding: 2px; } - QStatusBar::item {border: None;} +QStatusBar::item {border: None;} /* Progress Bars (Downloads) #QProgressBar */ QProgressBar { @@ -693,19 +693,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss index bfaa4c94..fb2e0422 100644 --- a/src/stylesheets/vs15 Dark-Yellow.qss +++ b/src/stylesheets/vs15 Dark-Yellow.qss @@ -1,4 +1,3 @@ -/*base*/ /*!************************************* VS15 Dark **************************************** @@ -603,7 +602,7 @@ SaveGameInfoWidget { border-width: 1px; padding: 2px; } - QStatusBar::item {border: None;} +QStatusBar::item {border: None;} /* Progress Bars (Downloads) #QProgressBar */ QProgressBar { @@ -693,19 +692,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss index 1d27be17..17def4dd 100644 --- a/src/stylesheets/vs15 Dark.qss +++ b/src/stylesheets/vs15 Dark.qss @@ -692,19 +692,6 @@ QTabBar QToolButton::left-arrow:hover { image: url(./vs15/scrollbar-left-hover.png); } /* Special styles */ -/* fix margins on tabs pane */ -QLineEdit#espFilterEdit { - margin: 0 0 6px 0; } - -QTreeView#downloadView { - margin: 4px 4px 0 4px; } - -QCheckBox#showHiddenBox { - margin: 0 0 4px 4px; } - -QLineEdit#downloadFilterEdit { - margin: 0 4px 4px 0; } - QWidget#tabImages QPushButton { background-color: transparent; margin: 0 .3em; |