r19783 by craig - Add Downloads palette - no functionality right now

scribus-commit scribus-commit at lists.scribus.net
Sun Feb 1 17:29:33 UTC 2015


Author: craig
Date: Sun Feb  1 17:29:33 2015
New Revision: 19783

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19783
Log:
Add Downloads palette - no functionality right now

Added:
    trunk/Scribus/scribus/ui/downloadspalette.cpp   (with props)
    trunk/Scribus/scribus/ui/downloadspalette.h   (with props)
    trunk/Scribus/scribus/ui/downloadspalettebase.ui   (with props)
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19783&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Feb  1 17:29:33 2015
@@ -94,6 +94,7 @@
 	ui/charselectenhanced.ui
 	ui/cmsprefsbase.ui
 	ui/colorpalette.ui
+	ui/downloadspalettebase.ui
 	ui/gradientaddedit.ui
 	ui/gradienteditor.ui
 	ui/gradientvectorbase.ui
@@ -325,6 +326,7 @@
 	ui/dasheditor.h
 	ui/dcolor.h
 	ui/delpages.h
+	ui/downloadspalette.h
 	ui/editor.h
 	ui/effectsdialog.h
 	ui/extimageprops.h
@@ -781,6 +783,7 @@
 	ui/dasheditor.cpp
 	ui/dcolor.cpp
 	ui/delpages.cpp
+	ui/downloadspalette.cpp
 	ui/editor.cpp
 	ui/effectsdialog.cpp
 	ui/extimageprops.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19783&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Sun Feb  1 17:29:33 2015
@@ -790,6 +790,8 @@
 	name="toolsPages";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="toolsBookmarks";
+	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
+	name="toolsDownloads";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name="toolsMeasurements";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, loadIcon("16/measure.png"), loadIcon("22/measure.png"), "", defaultKey(name), mainWindow, modeMeasurementTool));
@@ -889,6 +891,7 @@
 	(*scrActions)["toolsLayers"]->setShortcutContext(Qt::ApplicationShortcut);
 	(*scrActions)["toolsPages"]->setShortcutContext(Qt::ApplicationShortcut);
 	(*scrActions)["toolsBookmarks"]->setShortcutContext(Qt::ApplicationShortcut);
+	(*scrActions)["toolsDownloads"]->setShortcutContext(Qt::ApplicationShortcut);
 	(*scrActions)["toolsActionHistory"]->setShortcutContext(Qt::ApplicationShortcut);
 	(*scrActions)["toolsPreflightVerifier"]->setShortcutContext(Qt::ApplicationShortcut);
 	(*scrActions)["toolsAlignDistribute"]->setShortcutContext(Qt::ApplicationShortcut);
@@ -902,6 +905,7 @@
 	(*scrActions)["toolsLayers"]->setToggleAction(true);
 	(*scrActions)["toolsPages"]->setToggleAction(true);
 	(*scrActions)["toolsBookmarks"]->setToggleAction(true);
+	(*scrActions)["toolsDownloads"]->setToggleAction(true);
 	(*scrActions)["toolsMeasurements"]->setToggleAction(true);
 	(*scrActions)["toolsActionHistory"]->setToggleAction(true);
 	(*scrActions)["toolsPreflightVerifier"]->setToggleAction(true);
@@ -1662,6 +1666,7 @@
 	(*scrActions)["toolsLayers"]->setTexts( tr("&Layers"));
 	(*scrActions)["toolsPages"]->setTexts( tr("&Arrange Pages"));
 	(*scrActions)["toolsBookmarks"]->setTexts( tr("&Bookmarks"));
+	(*scrActions)["toolsDownloads"]->setTexts( tr("&Downloads"));
 	(*scrActions)["toolsMeasurements"]->setTexts( tr("&Measurements"));
 	(*scrActions)["toolsActionHistory"]->setTexts( tr("Action &History"));
 	(*scrActions)["toolsPreflightVerifier"]->setTexts( tr("Preflight &Verifier"));
@@ -2321,6 +2326,7 @@
 		<< "toolsLayers"
 		<< "toolsPages"
 		<< "toolsBookmarks"
+		<< "toolsDownloads"
 		<< "toolsMeasurements"
 		<< "toolsActionHistory"
 		<< "toolsPreflightVerifier"

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19783&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Feb  1 17:29:33 2015
@@ -173,6 +173,7 @@
 #include "ui/cpalette.h"
 #include "ui/customfdialog.h"
 #include "ui/delpages.h"
+#include "ui/downloadspalette.h"
 #include "ui/edittoolbar.h"
 #include "ui/effectsdialog.h"
 #include "ui/filetoolbar.h"
@@ -528,8 +529,10 @@
 	keyrep = false;
 	_arrowKeyDown = false;
 	ClipB = QApplication::clipboard();
-	palettesStatus[0] = false;
-	guidesStatus[0] = false;
+	for (int i=0; i<11 ; ++i)
+		palettesStatus[i] = false;
+	for (int i=0; i<13 ; ++i)
+		guidesStatus[0] = false;
 #ifdef HAVE_OSG
 	QStringList supportedExts;
 	supportedExts << "osg" << "dxf" << "flt" << "ive" << "geo" << "sta" << "stl" << "logo" << "3ds" << "ac" << "obj";
@@ -618,6 +621,10 @@
 	connect( scrActions["toolsBookmarks"], SIGNAL(toggled(bool)) , bookmarkPalette, SLOT(setPaletteShown(bool)) );
 	connect( bookmarkPalette, SIGNAL(paletteShown(bool)), scrActions["toolsBookmarks"], SLOT(setChecked(bool)));
 	bookmarkPalette->installEventFilter(this);
+	downloadsPalette = new DownloadsPalette(this);
+	connect( scrActions["toolsDownloads"], SIGNAL(toggled(bool)) , downloadsPalette, SLOT(setPaletteShown(bool)) );
+	connect( downloadsPalette, SIGNAL(paletteShown(bool)), scrActions["toolsDownloads"], SLOT(setChecked(bool)));
+	downloadsPalette->installEventFilter(this);
 	connect( scrActions["toolsMeasurements"], SIGNAL(toggledData(bool, int)) , this, SLOT(setAppModeByToggle(bool, int)) );
 	docCheckerPalette = new CheckDocument(this, false);
 	connect( scrActions["toolsPreflightVerifier"], SIGNAL(toggled(bool)) , docCheckerPalette, SLOT(setPaletteShown(bool)) );
@@ -1170,6 +1177,7 @@
 	scrMenuMgr->addMenuItemString("toolsPages", "Windows");
 	scrMenuMgr->addMenuItemString("toolsLayers", "Windows");
 	scrMenuMgr->addMenuItemString("toolsBookmarks", "Windows");
+	scrMenuMgr->addMenuItemString("toolsDownloads", "Windows");
 	scrMenuMgr->addMenuItemString("SEPARATOR", "Windows");
 	scrMenuMgr->addMenuItemString("toolsScrapbook", "Windows");
 	scrMenuMgr->addMenuItemString("toolsSymbols", "Windows");
@@ -1930,6 +1938,7 @@
 	outlinePalette->hide();
 	scrapbookPalette->hide();
 	bookmarkPalette->hide();
+	downloadsPalette->hide();
 	layerPalette->hide();
 	pagePalette->hide();
 	docCheckerPalette->hide();
@@ -5362,6 +5371,8 @@
 			bookmarkPalette->show();
 		if (palettesStatus[9])
 			docCheckerPalette->show();
+		if (palettesStatus[10])
+			downloadsPalette->show();
 		setUndoPalette(palettesStatus[8]);
 	}
 	else
@@ -5374,6 +5385,7 @@
 		palettesStatus[6] = bookmarkPalette->isVisible();
 		palettesStatus[8] = undoPalette->isVisible();
 		palettesStatus[9] = docCheckerPalette->isVisible();
+		palettesStatus[10] = downloadsPalette->isVisible();
 		propertiesPalette->hide();
 		outlinePalette->hide();
 		scrapbookPalette->hide();
@@ -5381,6 +5393,7 @@
 		pagePalette->hide();
 		layerPalette->hide();
 		docCheckerPalette->hide();
+		downloadsPalette->hide();
 		setUndoPalette(false);
 		palettesStatus[0] = true;
 	}
@@ -5688,6 +5701,7 @@
 	inlinePalette->setEnabled(b);
 	symbolPalette->setEnabled(b);
 	alignDistributePalette->setEnabled(b);
+	downloadsPalette->setEnabled(b);
 }
 
 void ScribusMainWindow::ToggleFrameEdit()
@@ -6564,6 +6578,7 @@
 	outlinePalette->startup();
 	scrapbookPalette->startup();
 	bookmarkPalette->startup();
+	downloadsPalette->startup();
 	pagePalette->startup();
 	layerPalette->startup();
 //	measurementPalette->startup();

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19783&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Sun Feb  1 17:29:33 2015
@@ -70,6 +70,7 @@
 class CharSelect;
 class CheckDocument;
 class ColorCombo;
+class DownloadsPalette;
 class EditToolBar;
 class FileToolBar;
 class FontCombo;
@@ -244,6 +245,7 @@
 	LayerPalette* layerPalette;
 	PagePalette *pagePalette;
 	BookPalette *bookmarkPalette;
+	DownloadsPalette *downloadsPalette;
 	SymbolPalette *symbolPalette;
 	InlinePalette *inlinePalette;
 	Measurements* measurementPalette;
@@ -632,7 +634,7 @@
 	int viewBopal;
 	int viewUndoPalette;
 
-	bool palettesStatus[10];
+	bool palettesStatus[11];
 	bool guidesStatus[13];
 
 	bool keyrep;




More information about the scribus-commit mailing list