Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Improved updater dialog.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-12-14 14:20:43 +01:00
parent 93641a7bfc
commit e194239b96
7 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
etc/setup/license.rtf
View File

Binary file not shown.

1
etc/setup/setup.nsi
View File

@ -132,7 +132,6 @@ VIAddVersionKey "Website" "${MyWebSite}"
;MUI2 Interface Settings ;MUI2 Interface Settings
;-------------------------------- ;--------------------------------
!define MUI_INSTFILESPAGE_COLORS "C5DEFB 000000"
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${MyRegPath}" !define MUI_STARTMENUPAGE_REGISTRY_KEY "${MyRegPath}"

38
gui/win_updater.ui
View File

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>410</width> <width>428</width>
<height>273</height> <height>257</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -78,7 +78,7 @@
</palette> </palette>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Web-Update</string> <string>Web Update</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../res/resources.qrc"> <iconset resource="../res/resources.qrc">
@ -98,21 +98,21 @@
<widget class="QLabel" name="logo"> <widget class="QLabel" name="logo">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>72</width> <width>96</width>
<height>72</height> <height>182</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>72</width> <width>96</width>
<height>72</height> <height>182</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../res/resources.qrc">:/images/update.png</pixmap> <pixmap resource="../res/resources.qrc">:/images/update_wizard.png</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>true</bool> <bool>true</bool>
@ -144,7 +144,7 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>32</width> <width>20</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -152,22 +152,6 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>6</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
@ -234,7 +218,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>8</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -305,7 +289,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>10</height> <height>8</height>
</size> </size>
</property> </property>
</spacer> </spacer>

BIN
res/images/update_wizard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

1
res/resources.qrc
View File

@ -52,6 +52,7 @@
<file>images/movie.png</file> <file>images/movie.png</file>
<file>images/python.png</file> <file>images/python.png</file>
<file>images/update.png</file> <file>images/update.png</file>
<file>images/update_wizard.png</file>
<file>images/x264.png</file> <file>images/x264.png</file>
</qresource> </qresource>
</RCC> </RCC>

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 2 #define VER_X264_MINOR 2
#define VER_X264_PATCH 7 #define VER_X264_PATCH 7
#define VER_X264_BUILD 698 #define VER_X264_BUILD 704
#define VER_X264_MINIMUM_REV 2363 #define VER_X264_MINIMUM_REV 2363
#define VER_X264_CURRENT_API 140 #define VER_X264_CURRENT_API 140

2
src/win_updater.cpp
View File

@ -310,7 +310,7 @@ void UpdaterDialog::threadFinished(void)
break; break;
case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder: case UpdateCheckThread::UpdateStatus_CompletedNewVersionOlder:
UPDATE_ICON(3, "shield_error"); UPDATE_ICON(3, "shield_error");
UPDATE_TEXT(3, tr("Your are using a pre-release version!")); UPDATE_TEXT(3, tr("You are using a pre-release version!"));
break; break;
default: default:
qWarning("Update thread succeeded with unexpected status code: %d", m_status); qWarning("Update thread succeeded with unexpected status code: %d", m_status);