Hello community,
here is the log from the commit of package q4wine for openSUSE:Factory checked in at 2016-09-05 21:22:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/q4wine (Old)
and /work/SRC/openSUSE:Factory/.q4wine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "q4wine"
Changes:
--------
--- /work/SRC/openSUSE:Factory/q4wine/q4wine.changes 2016-08-03 11:44:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.q4wine.new/q4wine.changes 2016-09-05 21:23:40.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Sep 1 19:27:49 UTC 2016 - lazy.kent@opensuse.org
+
+- Update to 1.3.2.
+ * Fixed:
+ + [regression, bisected] Icon information is not displayed
+ correctly.
+ + Winetricks does not update.
+ + First startup wizard (quick mount profile): profile strings
+ are initially empty if fuseiso is not installed.
+ + Download (latest) Winetricks from GitHub.
+ + Correct proxy-related environment variables in Winetricks
+ plugin.
+ + Use env command in the command line to download Winetricks.
+ + Support proxy username/password in Winetricks plugin.
+ + Treat aarch64 as 64 bit platform and put libraries in lib64
+ directory.
+
+-------------------------------------------------------------------
Old:
----
q4wine-1.3.1.tar.gz
New:
----
q4wine-1.3.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ q4wine.spec ++++++
--- /var/tmp/diff_new_pack.3Gkvq4/_old 2016-09-05 21:23:42.000000000 +0200
+++ /var/tmp/diff_new_pack.3Gkvq4/_new 2016-09-05 21:23:42.000000000 +0200
@@ -17,7 +17,7 @@
Name: q4wine
-Version: 1.3.1
+Version: 1.3.2
Release: 0
Summary: Qt4 GUI for WINE
License: GPL-3.0
@@ -29,6 +29,7 @@
BuildRequires: fuseiso
BuildRequires: hicolor-icon-theme
BuildRequires: icoutils
+BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
@@ -70,6 +71,7 @@
%build
mkdir build
cd build
+# FIXME: you should use %%cmake macros
cmake .. \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_C_FLAGS="%{optflags}" \
@@ -102,7 +104,7 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_libdir}/lib%{name}*
-%doc %{_mandir}/man?/*
+%{_mandir}/man?/*
%files lang -f %{name}.lang
%defattr(-,root,root,-)
++++++ q4wine-1.3.1.tar.gz -> q4wine-1.3.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/AUTHORS new/q4wine-1.3.2/AUTHORS
--- old/q4wine-1.3.1/AUTHORS 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/AUTHORS 2016-08-31 16:16:30.000000000 +0200
@@ -219,4 +219,10 @@
Testing, bug reports
mail: andrey.aleksandrovich@googlemail.com
Kharkov, Ukraine
+
+Masanori Kakura (kakurasan)
+Bug reports, testing, some fixes, feature requests
+mail: kakurasan@gmail.com
+web: https://kakurasan.blogspot.com/
+Japan
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/ChangeLog new/q4wine-1.3.2/ChangeLog
--- old/q4wine-1.3.1/ChangeLog 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/ChangeLog 2016-08-31 16:16:30.000000000 +0200
@@ -1,3 +1,14 @@
+Version 1.3.2
+ Fixed:
+ - [regression, bisected] Icon information is not displayed correctly [BUG-80];
+ - Winetricks does not update [BUG-77];
+ - First startup wizard (quick mount profile): profile strings are initially empty if fuseiso is not installed [BUG-81];
+ - Download (latest) Winetricks from GitHub [BUG-82];
+ - Correct proxy-related environment variables in Winetricks plugin [BUG-83];
+ - Use env command in the command line to download Winetricks [BUG-83];
+ - Support proxy username/password in Winetricks plugin [BUG-83];
+ - Treat aarch64 as 64 bit platform and put libraries in lib64 directory [BUG-85];
+
Version 1.3.1
Added:
- Allow to execute and create icons for *.bat and *.msi files [BUG-69];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/README new/q4wine-1.3.2/README
--- old/q4wine-1.3.1/README 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/README 2016-08-31 16:16:30.000000000 +0200
@@ -1,28 +1,33 @@
-q4wine was initially written by Alaxey S. Malakhov
+q4wine was originally written by Alexey S. Malakhov
-General idea comes from WineTools script which was initially written by Frank Hendriksen.
-It is licensed under the terms of GPLv3.
+The general idea for it came from the WineTools script which was originally
+written by Frank Hendriksen. It is licensed under the terms of GPLv3.
-Send comments, bugreports, etc. to me ;)
+Send comments, bug reports, etc. to me ;)
-Note: This software comes with absolutely no warranty. You will NOT get any support or help for WineTools,
-Wine, software installations, Linux or Microsoft Windows from the author.
+Note: This program comes with absolutely no warranty. You will NOT get any
+support or help for WineTools, Wine, software installations, Linux or
+Microsoft Windows from the author.
-If you need help, ask the mailing lists at http://www.winehq.org/site/forums.
+If you need help, ask the mailing lists at http://www.winehq.org/site/forums .
-If you want support, buy the commercial versions of wine: CodeWeavers CrossOver Office
-http://www.codeweavers.com for Desktop Applications.
+If you want support, buy the commercial versions of wine:
+CodeWeavers CrossOver Office http://www.codeweavers.com/ for Desktop
+Applications.
-Postinstall:
+Post-install:
***********************************************
-NOTE-
-This instructions may be outdated, please see last version of this howto here:
+These instructions may be outdated, so please see the latest version of this
+howto here:
+
http://q4wine.brezblock.org.ua/documentation/en_us/02-post-installation.html
+
------
-If you plan to use kdesu\gksu\xdg-su, then you might add folowing lines
-to /etc/sudoers (use visudo)
+If you plan to use kdesu, gksu or xdg-su, then you may wish to add the
+following lines to /etc/sudoers (using visudo)
#---------- Cut here -------------------------
Cmnd_Alias Q4WINE_COMMS=/sbin/losetup
@@ -31,27 +36,27 @@
Q4WINE_USERS ALL=(ALL) NOPASSWD: Q4WINE_COMMS
#---------- End of Cut -----------------------
-This will allow to run /sbin/losetup, which is used for building mounted iso's menu list,
-with out prompting root password.
+This will allow to run /sbin/losetup, which is used for building the mounted
+.isos menues' lists, with out prompting for root password.
-Otherwise you can't get mount menu working =)
+Otherwise you will not be able to get the mount menu working. =)
Uninstall:
***********************************************
-In q4wine build root run:
+In the q4wine's build root run:
xargs rm < install_manifest.txt
Changelog
***********************************************
-See changelog file for details
+See the ChangeLog file for details
---
+--
Regards,
Alexey S. Malakhov
-q4wine ( http://q4wine.brezblock.org.ua ) lead developer
-BrezBlock ( http://brezblock.org.ua ) maintainer
-e-mail: brezerk@gmail.com
-web: http://brezblock.org.ua
+q4wine ( http://q4wine.brezblock.org.ua/ ) lead developer
+BrezBlock ( http://brezblock.org.ua/ ) maintainer
+E-mail: brezerk@gmail.com
+Web-site: http://brezblock.org.ua/
BrezBlock, Kiev, Ukraine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/CMakeLists.txt new/q4wine-1.3.2/src/CMakeLists.txt
--- old/q4wine-1.3.1/src/CMakeLists.txt 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/CMakeLists.txt 2016-08-31 16:16:30.000000000 +0200
@@ -8,7 +8,7 @@
SET(CMAKE_VERBOSE_MAKEFILE ON)
-SET(APP_VERSION "1.3.1")
+SET(APP_VERSION "1.3.2")
SET(APP_NAME_GLOBAL "q4wine")
if(POLICY CMP0011)
@@ -169,6 +169,8 @@
IF( NOT LIBS_ENTRY_PATH )
IF (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES x86_64)
SET( LIBS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/lib64/q4wine)
+ ELSEIF (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES aarch64)
+ SET( LIBS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/lib64/q4wine)
ELSE (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES x86_64)
SET( LIBS_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/lib/q4wine)
ENDIF (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES x86_64)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/core/database/db.cpp new/q4wine-1.3.2/src/core/database/db.cpp
--- old/q4wine-1.3.1/src/core/database/db.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/core/database/db.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -148,6 +148,13 @@
query.bindValue(":desc", "%REFRESH_WINETRICKS_DESC%");
if (!query.exec())
return false;
+
+ query.prepare("INSERT INTO sysconfig(id, name, icon, type, desc, provider_id) VALUES(NULL, :name, :icon, NULL, :desc, 2);");
+ query.bindValue(":name", "%ABOUT_WINETRICKS%");
+ query.bindValue(":icon", "go-home");
+ query.bindValue(":desc", "%ABOUT_WINETRICKS_DESC%");
+ if (!query.exec())
+ return false;
} else if (table == "versions"){
if(!query.exec("CREATE TABLE versions (wine_dllpath32 TEXT, wine_dllpath64 TEXT, wine_loader TEXT, wine_server TEXT, wine_exec TEXT, id INTEGER PRIMARY KEY, name TEXT);"))
return false;
@@ -236,7 +243,8 @@
return false;
}
}
- if (query.exec("SELECT icon FROM providers WHERE icon='wine.png'")){
+ query.exec("SELECT icon FROM providers WHERE icon='wine.png'");
+ if (query.next()){
if (!query.exec("UPDATE providers SET icon='regedit' WHERE icon='regedit.png'")){
qDebug()<<"[EE] Cannot update providers table";
return false;
@@ -246,5 +254,16 @@
return false;
}
}
+ query.exec("SELECT id FROM sysconfig WHERE icon='go-home'");
+ if (!query.next()){
+ query.prepare("INSERT INTO sysconfig(id, name, icon, type, desc, provider_id) VALUES(NULL, :name, :icon, NULL, :desc, 2);");
+ query.bindValue(":name", "%ABOUT_WINETRICKS%");
+ query.bindValue(":icon", "go-home");
+ query.bindValue(":desc", "%ABOUT_WINETRICKS_DESC%");
+ if (!query.exec()){
+ qDebug()<<"[EE] Cannot update sysconfig table";
+ return false;
+ }
+ }
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/plugins/winetricks.cpp new/q4wine-1.3.2/src/plugins/winetricks.cpp
--- old/q4wine-1.3.1/src/plugins/winetricks.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/plugins/winetricks.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -91,8 +91,15 @@
sh_args.append("env");
if (!proxy_host.isEmpty()){
- sh_args.append(QString("HTTP_PROXY=http://%1:%2").arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString()));
- sh_args.append(QString("FTP_PROXY=http://%1:%2").arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString()));
+ QString proxy_auth = CoreLib->getSetting("network", "user", false).toString();
+ if (!proxy_auth.isEmpty()){
+ QString proxy_pass = CoreLib->getSetting("network", "pass", false).toString();
+ proxy_auth.append(QString(":%1@").arg(proxy_pass));
+ }
+ QString proxy_var = QString("http://%1%2:%3").arg(proxy_auth).arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString());
+ sh_args.append(QString("http_proxy='%1'").arg(proxy_var));
+ sh_args.append(QString("https_proxy='%1'").arg(proxy_var));
+ sh_args.append(QString("ftp_proxy='%1'").arg(proxy_var));
}
QHash prefix_info = db_prefix.getByName(this->prefix_name);
@@ -154,14 +161,30 @@
}
void winetricks::downloadwinetricks () {
- /*
- * Downloading winetricks and installing it
- */
+ /*
+ * Downloading winetricks and installing it
+ */
this->winetricks_bin = QDir::homePath();
this->winetricks_bin.append("/.config/");
this->winetricks_bin.append(APP_SHORT_NAME);
this->winetricks_bin.append("/winetricks");
+ QFile file(this->winetricks_bin);
+
+ if (file.exists()){
+ if (!file.open(QIODevice::ReadWrite | QIODevice::Text)){
+ QMessageBox::warning(this, QString(tr("Error")), QString(tr("File '%1' is not writable or not readable. Check file permissions.").arg(this->winetricks_bin)));
+ return;
+ }
+ } else {
+ if (!file.open(QIODevice::ReadWrite | QIODevice::Text)){
+ QMessageBox::warning(this, QString(tr("Error")), QString(tr("Can't create file '%1'. Check folder permissions.").arg(this->winetricks_bin)));
+ return;
+ } else {
+ file.remove();
+ }
+ }
+
QStringList args;
if (!console_args.isEmpty()){
// If we have any conslope parametres, we gona preccess them one by one
@@ -172,18 +195,25 @@
}
}
- QString proxy_host = CoreLib->getSetting("network", "host", false).toString();
- if (!proxy_host.isEmpty()){
- args.append("env");
- args.append(QString("HTTP_PROXY=http://%1:%2").arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString()));
- args.append(QString("FTP_PROXY=http://%1:%2").arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString()));
- }
-
QString arg;
arg.append(CoreLib->getWhichOut("sh"));
arg.append(" -c \"");
+
+ if (CoreLib->getSetting("network", "type", 0).toInt() != 0){
+ QString proxy_host = CoreLib->getSetting("network", "host", false).toString();
+ if (!proxy_host.isEmpty()){
+ QString proxy_auth = CoreLib->getSetting("network", "user", false).toString();
+ if (!proxy_auth.isEmpty()){
+ QString proxy_pass = CoreLib->getSetting("network", "pass", false).toString();
+ proxy_auth.append(QString(":%1@").arg(proxy_pass));
+ }
+ QString proxy_var = QString("http://%1%2:%3").arg(proxy_auth).arg(proxy_host).arg(CoreLib->getSetting("network", "port", false).toString());
+ arg.append(QString("env https_proxy='%1' ").arg(proxy_var));
+ }
+ }
+
arg.append(CoreLib->getWhichOut("wget"));
- arg.append(" http://kegel.com/wine/winetricks -O ");
+ arg.append(" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetrick... -O ");
arg.append(this->winetricks_bin);
arg.append(" && ");
arg.append(CoreLib->getWhichOut("chmod"));
@@ -216,6 +246,7 @@
p.start(command);
p.waitForFinished();
+
QString stdout = codec->toUnicode(p.readAllStandardOutput());
return stdout.split("\n");
}
@@ -224,9 +255,11 @@
if (!check_script())
return false;
- QProgressDialog *pd = new QProgressDialog(tr("Refreshing winetricks application list."), QString(), 0, 100);
+ QProgressDialog *pd = new QProgressDialog(tr("Refreshing Winetricks application list."), QString(), 0, 100);
pd->setModal(true);
- pd->show();
+ pd->setWindowTitle(tr("Winetricks plugin"));
+ pd->setFixedWidth(400);
+ pd->show();
pd->setValue(5);
QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents, 100);
@@ -253,8 +286,10 @@
foreach (QString subtype, subtypes){
pd->setValue(pd->value() + step);
+ pd->setLabelText(tr("Reading category: %1").arg(subtype));
QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents, 100);
- if (!subtype.isEmpty()){
+ if ((!subtype.isEmpty()) and (!subtype.startsWith("Using winetricks"))) {
+ qDebug() << "\"" << subtype << "\"";
subtype = subtype.trimmed();
pargs.clear();
pargs.append(winetricks_bin);
@@ -262,9 +297,9 @@
pargs.append(subtype);
pargs.append(" list");
foreach (QString item, this->get_stdout_lines(pargs)){
- if (item.isEmpty())
+ if ((item.isEmpty()) or (item.startsWith("Using winetricks")))
continue;
- db_sysconfig.add_item(item.left(24).trimmed(), "application-x-ms-dos-executable", item.mid(24).trimmed(), subtype, D_PROVIDER_WINETRICKS);
+ db_sysconfig.add_item(item.section(' ', 0, 0), "application-x-ms-dos-executable", item.section(' ', 1, -1, QString::SectionSkipEmpty), subtype, D_PROVIDER_WINETRICKS);
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/authors.h new/q4wine-1.3.2/src/q4wine-gui/authors.h
--- old/q4wine-1.3.1/src/q4wine-gui/authors.h 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/authors.h 2016-08-31 16:16:30.000000000 +0200
@@ -644,5 +644,23 @@
"<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
" " \
"</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ "Masanori Kakura (kakurasan)" \
+ "</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ "Bug reports, testing, some fixes, feature requests" \
+ "</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ "<span style='color:#6495ed;'>E-Mail</span>: <a href='mailto:kakurasan@gmail.com' style='text-decoration: none; color:#5f9ea0;'>kakurasan@gmail.com</a>" \
+ "</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ "<span style='color:#6495ed;'>Web</span>: <a href='https://kakurasan.blogspot.com/' style='color:#5f9ea0;'>https://kakurasan.blogspot.com/</a>" \
+ "</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ "Japan" \
+ "</p>" \
+ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \
+ " " \
+ "</p>" \
"</body>" \
"<html>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/authors.yaml new/q4wine-1.3.2/src/q4wine-gui/authors.yaml
--- old/q4wine-1.3.1/src/q4wine-gui/authors.yaml 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/authors.yaml 2016-08-31 16:16:30.000000000 +0200
@@ -258,3 +258,10 @@
info: Testing, bug reports
mail: andrey.aleksandrovich@googlemail.com
location: Kharkov, Ukraine
+
+ - name: Masanori Kakura
+ nick: kakurasan
+ info: Bug reports, testing, some fixes, feature requests
+ mail: kakurasan@gmail.com
+ web: https://kakurasan.blogspot.com/
+ location: Japan
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/uis/VersionManager.ui new/q4wine-1.3.2/src/q4wine-gui/uis/VersionManager.ui
--- old/q4wine-1.3.1/src/q4wine-gui/uis/VersionManager.ui 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/uis/VersionManager.ui 2016-08-31 16:16:30.000000000 +0200
@@ -92,274 +92,295 @@
<rect>
<x>20</x>
<y>30</y>
- <width>241</width>
- <height>191</height>
+ <width>367</width>
+ <height>280</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
- <widget class="QWidget" name="widget_5" native="true">
- <layout class="QHBoxLayout" name="_15">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="label_9">
- <property name="minimumSize">
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>Bin:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="txtWineBin"/>
- </item>
- <item>
- <widget class="QPushButton" name="cmdGetWineBin">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="widget_6" native="true">
- <layout class="QHBoxLayout" name="_16">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="label_10">
- <property name="minimumSize">
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>Server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="txtWineServerBin"/>
- </item>
- <item>
- <widget class="QPushButton" name="cmdGetWineServerBin">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="widget_12" native="true">
- <layout class="QHBoxLayout" name="_17">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string/>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
- <widget class="QLabel" name="label_12">
- <property name="minimumSize">
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>Loader:</string>
- </property>
+ <widget class="QWidget" name="widget_5" native="true">
+ <layout class="QHBoxLayout" name="_15">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_9">
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Bin:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="txtWineBin"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cmdGetWineBin">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="txtWineLoaderBin"/>
- </item>
- <item>
- <widget class="QPushButton" name="cmdGetWineLoaderBin">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
+ <widget class="QWidget" name="widget_6" native="true">
+ <layout class="QHBoxLayout" name="_16">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_10">
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Server:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="txtWineServerBin"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cmdGetWineServerBin">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="widget_13" native="true">
- <layout class="QHBoxLayout" name="_18">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
<item>
- <widget class="QLabel" name="label_13">
- <property name="minimumSize">
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>Libs 32:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="txtWineLibs32"/>
- </item>
- <item>
- <widget class="QPushButton" name="cmdGetWineLibs32">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
+ <widget class="QWidget" name="widget_12" native="true">
+ <layout class="QHBoxLayout" name="_17">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_12">
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Loader:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="txtWineLoaderBin"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cmdGetWineLoaderBin">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QWidget" name="widget_14" native="true">
- <layout class="QHBoxLayout" name="_19">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Optional</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLabel" name="label_14">
- <property name="minimumSize">
- <size>
- <width>140</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>140</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="text">
- <string>Libs 64:</string>
- </property>
+ <widget class="QWidget" name="widget_13" native="true">
+ <layout class="QHBoxLayout" name="_18">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_13">
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Libs 32:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="txtWineLibs32"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cmdGetWineLibs32">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="txtWineLibs64"/>
- </item>
- <item>
- <widget class="QPushButton" name="cmdGetWineLibs64">
- <property name="text">
- <string/>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
+ <widget class="QWidget" name="widget_14" native="true">
+ <layout class="QHBoxLayout" name="_19">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label_14">
+ <property name="minimumSize">
+ <size>
+ <width>140</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>Libs 64:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="txtWineLibs64"/>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cmdGetWineLibs64">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
+ <zorder>label_13</zorder>
+ <zorder>widget_13</zorder>
+ <zorder>widget_14</zorder>
</widget>
</item>
<item>
@@ -378,6 +399,9 @@
</layout>
</widget>
</widget>
+ <zorder>wPrefix</zorder>
+ <zorder>wSettings</zorder>
+ <zorder>widget_5</zorder>
</widget>
</item>
<item>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/versions.cpp new/q4wine-1.3.2/src/q4wine-gui/versions.cpp
--- old/q4wine-1.3.1/src/q4wine-gui/versions.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/versions.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -117,7 +117,7 @@
connect(txtWineBin, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
connect(txtWineLibs32, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
- connect(txtWineLibs32, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
+ connect(txtWineLibs64, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
connect(txtWineLoaderBin, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
connect(txtWineServerBin, SIGNAL(textChanged(QString)), this, SLOT(versionSettingsChanged(QString)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/widgets/iconlistwidget.cpp new/q4wine-1.3.2/src/q4wine-gui/widgets/iconlistwidget.cpp
--- old/q4wine-1.3.1/src/q4wine-gui/widgets/iconlistwidget.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/widgets/iconlistwidget.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -270,7 +270,6 @@
}
void IconListWidget::itemClicked (QListWidgetItem *item){
- return;
if (!item)
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/widgets/prefixconfigwidget.cpp new/q4wine-1.3.2/src/q4wine-gui/widgets/prefixconfigwidget.cpp
--- old/q4wine-1.3.1/src/q4wine-gui/widgets/prefixconfigwidget.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/widgets/prefixconfigwidget.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -110,20 +110,20 @@
splitter.reset(new QSplitter(this));
splitter->addWidget(treeFrameWidget.release());
splitter->addWidget(iconsFrameWidget.release());
+ splitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
infoName.reset(new QLabel(QString("%1:\n\%2:").arg(tr("Name")).arg(tr("Description")), this));
- infoName->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
infoName->setTextInteractionFlags(Qt::TextSelectableByMouse);
infoName->setWordWrap(true);
std::auto_ptr<QFrame> frame(new QFrame(this));
layout.reset(new QVBoxLayout(this));
- layout->setSpacing(0);
+ layout->setSpacing(3);
layout->setContentsMargins(0,6,0,0);
layout->addWidget(infoName.get());
frame->setLayout(layout.release());
- frame->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+ frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
infoName->setFrameStyle(QFrame::Raised);
infoName->setFrameShape(QFrame::StyledPanel);
@@ -291,6 +291,10 @@
name = tr("Refresh Winetricks application list");
desc = tr("Create or update Q4Wine's cache of Winetricks appications.");
iconItem->setIcon(CoreLib->loadIcon("edit-redo"));
+ } else if (items.at(i).name == "%ABOUT_WINETRICKS%"){
+ name = tr("Goto Winetricks homepage");
+ desc = tr("Read news, report bugs and join the Winetricks community at https://github.com/Winetricks/winetricks");
+ iconItem->setIcon(CoreLib->loadIcon("go-home"));
}
}
iconItem->setText(name);
@@ -412,6 +416,8 @@
this->createTree();
} else if (item->text() == tr("Install or update Winetricks script")){
wine_t.install_winetricks();
+ } else if (item->text() == tr("Goto Winetricks homepage")){
+ CoreLib->openUrl("https://github.com/Winetricks/winetricks");
} else {
wine_t.run_winetricks(item->text());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.3.1/src/q4wine-gui/wizard.cpp new/q4wine-1.3.2/src/q4wine-gui/wizard.cpp
--- old/q4wine-1.3.1/src/q4wine-gui/wizard.cpp 2016-07-21 21:49:14.000000000 +0200
+++ new/q4wine-1.3.2/src/q4wine-gui/wizard.cpp 2016-08-31 16:16:30.000000000 +0200
@@ -165,8 +165,10 @@
#else
if (CoreLib->getWhichOut("fuseiso", false).isEmpty()){
this->comboMountProfiles->setCurrentIndex(0);
+ this->comboMountProfiles_currentIndexChanged(0);
} else {
this->comboMountProfiles->setCurrentIndex(2);
+ this->comboMountProfiles_currentIndexChanged(2);
}
#endif
@@ -569,10 +571,12 @@
case 2:
if (CoreLib->getWhichOut("fusermount").isEmpty()){
this->comboMountProfiles->setCurrentIndex(0);
+ this->comboMountProfiles_currentIndexChanged(0);
return;
}
if (CoreLib->getWhichOut("fuseiso").isEmpty()){
this->comboMountProfiles->setCurrentIndex(0);
+ this->comboMountProfiles_currentIndexChanged(0);
return;
}
break;