r20295 by craig - Revert incorrect commit on resource manager

scribus-commit scribus-commit at lists.scribus.net
Thu Jul 30 06:01:20 UTC 2015


Author: craig
Date: Thu Jul 30 06:01:20 2015
New Revision: 20295

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20295
Log:
Revert incorrect commit on resource manager

Modified:
    trunk/Scribus/scribus/ui/resourcemanager.cpp
    trunk/Scribus/scribus/ui/resourcemanager.h
    trunk/Scribus/scribus/ui/resourcemanagerbase.ui

Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20295&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp Thu Jul 30 06:01:20 2015
@@ -24,7 +24,6 @@
 #include <QDomDocument>
 #include <QFile>
 #include <QFileInfo>
-#include <QPushButton>
 #include <QString>
 #include <QStringList>
 #include <QTableWidget>
@@ -53,7 +52,6 @@
 	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()
@@ -724,16 +722,3 @@
 	}
 }
 
-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=20295&path=/trunk/Scribus/scribus/ui/resourcemanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.h (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.h Thu Jul 30 06:01:20 2015
@@ -92,7 +92,6 @@
 		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=20295&path=/trunk/Scribus/scribus/ui/resourcemanagerbase.ui
==============================================================================
Binary files - no diff available.




More information about the scribus-commit mailing list