r20294 by craig - #13236: Add Travis YML file

[scribus-commit]

Author: craig
Date: Thu Jul 30 05:58:18 2015
New Revision: 20294

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20294
Log:
#13236: Add Travis YML file

Added:
    trunk/Scribus/.travis.yml
Modified:
    trunk/Scribus/Scribus.pro
    trunk/Scribus/scribus/ui/resourcemanager.cpp
    trunk/Scribus/scribus/ui/resourcemanager.h
    trunk/Scribus/scribus/ui/resourcemanagerbase.ui

Modified: trunk/Scribus/Scribus.pro
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20294&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Thu Jul 30 05:58:18 2015
@@ -1,11 +1,10 @@
 ######################################################################
-# Automatically generated by qmake (3.0) Sat Jul 25 00:01:36 2015
+# Automatically generated by qmake (3.0) Mon Jul 27 22:43:40 2015
 ######################################################################
 
 TEMPLATE = app
 TARGET = Scribus
 INCLUDEPATH += .
-INCLUDEPATH += ./scribus
 
 # Input
 HEADERS += scribus/actionmanager.h \

Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20294&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp Thu Jul 30 05:58:18 2015
@@ -24,6 +24,7 @@
 #include <QDomDocument>
 #include <QFile>
 #include <QFileInfo>
+#include <QPushButton>
 #include <QString>
 #include <QStringList>
 #include <QTableWidget>
@@ -52,6 +53,7 @@
 	connect(categoryComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(categoryChanged()));
 	connect(updateAvailableButton, SIGNAL(clicked()), this, SLOT(updateDownloadLists()));
 	connect(downloadButton, SIGNAL(clicked()), this, SLOT(startDownload()));
+	connect(showLicenseToolButton, SIGNAL(clicked()), this, SLOT(showLicenseArea()));
 }
 
 void ResourceManager::languageChange()
@@ -722,3 +724,16 @@
 	}
 }
 
+void ResourceManager::showLicenseArea()
+{
+	licenseLabel->setVisible(!licenseLabel->isVisible());
+	licenseTextBrowser->setVisible(licenseLabel->isVisible());
+	if(licenseLabel->isVisible())
+		licenseVerticalSpacer->changeSize(20,36,QSizePolicy::Fixed,QSizePolicy::Fixed);
+	else
+		licenseVerticalSpacer->changeSize(0,0,QSizePolicy::Fixed,QSizePolicy::Fixed);
+	resize(1, 1); // megahack to keep palette small
+	updateGeometry();
+	adjustSize();
+}
+

Modified: trunk/Scribus/scribus/ui/resourcemanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20294&path=/trunk/Scribus/scribus/ui/resourcemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.h (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.h Thu Jul 30 05:58:18 2015
@@ -92,6 +92,7 @@
 		void downloadFilesFinished();
 		void updateProgressBar();
 		void startDownload();
+		void showLicenseArea();
 
 };
 

Modified: trunk/Scribus/scribus/ui/resourcemanagerbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20294&path=/trunk/Scribus/scribus/ui/resourcemanagerbase.ui
==============================================================================
Binary files - no diff available.