r21740 by craig - Add new icons from Dezso Markon as well as convert all xpms in use to png and adjust code

scribus-commit scribus-commit at lists.scribus.net
Mon Jan 23 20:13:17 UTC 2017


Author: craig
Date: Mon Jan 23 20:13:17 2017
New Revision: 21740

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21740
Log:
Add new icons from Dezso Markon as well as convert all xpms in use to png and adjust code

Added:
    trunk/Scribus/resources/iconsets/1_5_0/dragpix.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawcalligraphy.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawframe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawimageframe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawlatexframe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawpolyline.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawtable.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/drawtextframe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/handc.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/lupe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/lupez.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/lupezm.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_0/zeichen.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/AllCaps.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/AppIcon.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/Kapital.xpm   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/Revers.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/Strike.xpm   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/editm.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/hoch.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/kapital.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/lupe.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/lupez.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/lupezm.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/noicon.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/ooo_draw.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/ooo_writer.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/outlined.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/postscript.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/shade.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/shadow.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/stift.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/strike.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/tief.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/txt.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/unter.png   (with props)
    trunk/Scribus/resources/iconsets/1_5_1/vectorgfx.png   (with props)
Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/canvasgesture_pan.cpp
    trunk/Scribus/scribus/canvasmode.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/canvasmode_magnifier.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/ui/AdapterWidget.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
    trunk/Scribus/scribus/ui/scmenu.cpp
    trunk/Scribus/scribus/ui/smcstylewidget.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/scribus/ui/styleselect.cpp
    trunk/Scribus/scribus/undomanager.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp	(original)
+++ trunk/Scribus/scribus/actionmanager.cpp	Mon Jan 23 20:13:17 2017
@@ -76,7 +76,7 @@
 	im = IconManager::instance();
 
 #ifdef Q_OS_MAC
-	noIcon = im->loadPixmap("noicon.xpm");
+	noIcon = im->loadPixmap("noicon.png");
 #endif
 
 	createActions();
@@ -844,7 +844,7 @@
 	name="toolsInsertSpiral";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("16/draw-spiral.png"), im->loadPixmap("22/draw-spiral.png"), "", defaultKey(name), mainWindow, modeDrawSpiral));
 	name="toolsInsertLine";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Stift16.xpm"), im->loadPixmap("Stift.xpm"), "", defaultKey(name), mainWindow, modeDrawLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Stift16.png"), im->loadPixmap("stift.png"), "", defaultKey(name), mainWindow, modeDrawLine));
 	name="toolsInsertBezier";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("16/draw-path.png"), im->loadPixmap("22/draw-path.png"), "", defaultKey(name), mainWindow, modeDrawBezierLine));
 	name="toolsInsertFreehandLine";
@@ -860,7 +860,7 @@
 	name="toolsZoomOut";
 	scrActions->insert(name, new ScrAction(im->loadPixmap("16/zoom-out.png"), im->loadPixmap("22/zoom-out.png"), "", defaultKey(name), mainWindow));
 	name="toolsEditContents";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Editm16.png"), im->loadPixmap("Editm.xpm"), "", defaultKey(name), mainWindow, modeEdit));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("Editm16.png"), im->loadPixmap("editm.png"), "", defaultKey(name), mainWindow, modeEdit));
 	name="toolsEditWithStoryEditor";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("16/story-editor.png"), im->loadPixmap("22/story-editor.png"), "", defaultKey(name), mainWindow, modeStoryEditor));
 	name="toolsLinkTextFrame";

Modified: trunk/Scribus/scribus/canvasgesture_pan.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasgesture_pan.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_pan.cpp	(original)
+++ trunk/Scribus/scribus/canvasgesture_pan.cpp	Mon Jan 23 20:13:17 2017
@@ -30,7 +30,7 @@
 void PanGesture::activate(bool fromGesture)
 {
 	m_cursor = m_view->cursor();
-	m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
+	m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
 }
 
 void PanGesture::deactivate(bool forgesture)

Modified: trunk/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode.cpp	Mon Jan 23 20:13:17 2017
@@ -780,22 +780,22 @@
 		case modeDrawShapes:
 		case modeDrawArc:
 		case modeDrawSpiral:
-			cursor = im->loadCursor("DrawFrame.xpm");
+			cursor = im->loadCursor("drawframe.png");
 			break;
 		case modeDrawImage:
-			cursor = im->loadCursor("DrawImageFrame.xpm");
+			cursor = im->loadCursor("drawimageframe.png");
 			break;
 		case modeDrawLatex:
-			cursor = im->loadCursor("DrawLatexFrame.xpm");
+			cursor = im->loadCursor("drawlatexframe.png");
 			break;
 		case modeDrawText:
-			cursor = im->loadCursor("DrawTextFrame.xpm");
+			cursor = im->loadCursor("drawtextframe.png");
 			break;
 		case modeDrawTable2:
-			cursor = im->loadCursor("DrawTable.xpm");
+			cursor = im->loadCursor("drawtable.png");
 			break;
 		case modeDrawRegularPolygon:
-			cursor = im->loadCursor("DrawPolylineFrame.xpm");
+			cursor = im->loadCursor("drawpolylineframe.png");
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -805,19 +805,19 @@
 			cursor = im->loadCursor("DrawFreeLine.png", 0, 31);
 			break;
 		case modeDrawCalligraphicLine:
-			cursor = im->loadCursor("DrawCalligraphy.xpm", 4, 4);
+			cursor = im->loadCursor("drawcalligraphy.png", 4, 4);
 			break;
 		case modeImportObject:
-			cursor = im->loadCursor("DragPix.xpm");
+			cursor = im->loadCursor("dragpix.png");
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				cursor = im->loadCursor("LupeZ.xpm");
+				cursor = im->loadCursor("lupez.png");
 			else
-				cursor = im->loadCursor("LupeZm.xpm");
+				cursor = im->loadCursor("lupezm.png");
 			break;
 		case modePanning:
-			cursor = im->loadCursor("HandC.xpm");
+			cursor = im->loadCursor("handc.png");
 			break;
 		case modeEyeDropper:
 			cursor = im->loadCursor("colorpickercursor.png", 0, 31);
@@ -860,22 +860,22 @@
 		case modeDrawShapes:
 		case modeDrawArc:
 		case modeDrawSpiral:
-			m_view->setCursor(im->loadCursor("DrawFrame.xpm"));
+			m_view->setCursor(im->loadCursor("drawframe.png"));
 			break;
 		case modeDrawImage:
-			m_view->setCursor(im->loadCursor("DrawImageFrame.xpm"));
+			m_view->setCursor(im->loadCursor("drawimageframe.png"));
 			break;
 		case modeDrawLatex:
-			m_view->setCursor(im->loadCursor("DrawLatexFrame.xpm"));
+			m_view->setCursor(im->loadCursor("drawlatexframe.png"));
 			break;
 		case modeDrawText:
-			m_view->setCursor(im->loadCursor("DrawTextFrame.xpm"));
+			m_view->setCursor(im->loadCursor("drawtextframe.png"));
 			break;
 		case modeDrawTable2:
-			m_view->setCursor(im->loadCursor("DrawTable.xpm"));
+			m_view->setCursor(im->loadCursor("drawtable.png"));
 			break;
 		case modeDrawRegularPolygon:
-			m_view->setCursor(im->loadCursor("DrawPolylineFrame.xpm"));
+			m_view->setCursor(im->loadCursor("drawpolylineframe.png"));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -885,19 +885,19 @@
 			m_view->setCursor(im->loadCursor("DrawFreeLine.png", 0, 31));
 			break;
 		case modeDrawCalligraphicLine:
-			m_view->setCursor(im->loadCursor("DrawCalligraphy.xpm", 4, 4));
+			m_view->setCursor(im->loadCursor("drawcalligraphy.png", 4, 4));
 			break;
 		case modeImportObject:
-			m_view->setCursor(im->loadCursor("DragPix.xpm"));
+			m_view->setCursor(im->loadCursor("dragpix.png"));
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				m_view->setCursor(im->loadCursor("LupeZ.xpm"));
+				m_view->setCursor(im->loadCursor("lupez.png"));
 			else
-				m_view->setCursor(im->loadCursor("LupeZm.xpm"));
+				m_view->setCursor(im->loadCursor("lupezm.png"));
 			break;
 		case modePanning:
-			m_view->setCursor(im->loadCursor("HandC.xpm"));
+			m_view->setCursor(im->loadCursor("handc.png"));
 			break;
 		case modeEyeDropper:
 			m_view->setCursor(im->loadCursor("colorpickercursor.png", 0, 31));
@@ -1714,7 +1714,7 @@
 	if ((m_doc->appMode == modePanning) && (e->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
 		m_view->requestMode(modeNormal);
 	if (m_doc->appMode == modeMagnifier)
-		m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
+		m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
 	if (e->isAutoRepeat() || !m_arrowKeyDown)
 		return;
 	switch(e->key())

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp	Mon Jan 23 20:13:17 2017
@@ -427,7 +427,7 @@
 				}
 				else
 				{
-					m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
+					m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
 					QTransform mm1 = currItem->getTransform();
 					QTransform mm2 = mm1.inverted();
 					QPointF rota = mm2.map(QPointF(newX, newY)) - mm2.map(QPointF(Mxp, Myp));
@@ -498,7 +498,7 @@
 							if (m->modifiers() & Qt::ShiftModifier)
 								m_view->setCursor(IconManager::instance()->loadCursor("Rotieren2.png"));
 							else
-								m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
+								m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
 						}
 					}
 				}

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp	Mon Jan 23 20:13:17 2017
@@ -170,12 +170,12 @@
 	{
 		PageItem_ImageFrame *currItem;
 		if((currItem = item->asImageFrame()) != NULL)
-			m_view->setCursor(IconManager::instance()->loadCursor("DrawImageFrame.xpm"));
+			m_view->setCursor(IconManager::instance()->loadCursor("drawimageframe.png"));
 		else
 			m_view->setCursor(QCursor(Qt::ArrowCursor));
 	}
 	else
-		m_view->setCursor(IconManager::instance()->loadCursor("DrawImageFrame.xpm"));
+		m_view->setCursor(IconManager::instance()->loadCursor("drawimageframe.png"));
 	if (commonMouseMove(m))
 		return;
 }

Modified: trunk/Scribus/scribus/canvasmode_magnifier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode_magnifier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_magnifier.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_magnifier.cpp	Mon Jan 23 20:13:17 2017
@@ -166,12 +166,12 @@
 	if ((m->modifiers() == Qt::ShiftModifier) || (m->button() == Qt::RightButton))
 	{
 		m_view->Magnify = false;
-		m_view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
+		m_view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
 	}
 	else
 	{
 		m_view->Magnify = true;
-		m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
+		m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
 	}
 	m_Mxp = mousePointDoc.x(); //m->globalPos().x();
 	m_Myp = mousePointDoc.y(); //m->globalPos().y();
@@ -226,9 +226,9 @@
 			else
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
-					m_view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
+					m_view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
 				else
-					m_view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
+					m_view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
 			}
 		}
 	}

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp	Mon Jan 23 20:13:17 2017
@@ -1050,7 +1050,7 @@
 					if (m_canvas->hitsCanvasPoint(m->globalPos(), FPoint(pl.x(), pl.y())))
 					{
 						if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
-							m_view->setCursor(IconManager::instance()->loadCursor("HandC.xpm"));
+							m_view->setCursor(IconManager::instance()->loadCursor("handc.png"));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::ADD_POINT)
 							m_view->setCursor(IconManager::instance()->loadCursor("AddPoint.png", 1, 1));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp	Mon Jan 23 20:13:17 2017
@@ -484,7 +484,7 @@
 				ScElemMimeData* md = ScriXmlDoc::WriteToMimeData(m_doc, m_doc->m_Selection);
 				QDrag* dr = new QDrag(m_view);
 				dr->setMimeData(md);
-				const QPixmap& pm = IconManager::instance()->loadPixmap("DragPix.xpm");
+				const QPixmap& pm = IconManager::instance()->loadPixmap("dragpix.png");
 				dr->setPixmap(pm);
 			//	dr->setDragCursor(pm, Qt::CopyAction);
 			//	dr->setDragCursor(pm, Qt::MoveAction);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Mon Jan 23 20:13:17 2017
@@ -307,7 +307,7 @@
 #ifdef Q_OS_MAC
 	//commenting this out until this is resolved :https://bugreports.qt.io/browse/QTBUG-44565
 	//ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus);
-	//noIcon = IconManager::instance()->loadPixmap("noicon.xpm");
+	//noIcon = IconManager::instance()->loadPixmap("noicon.png");
 #endif
 }
 
@@ -1648,7 +1648,7 @@
 	{
 		if ((doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift))
 		{
-			view->setCursor(IconManager::instance()->loadCursor("LupeZm.xpm"));
+			view->setCursor(IconManager::instance()->loadCursor("lupezm.png"));
 			return;
 		}
 	}
@@ -1880,7 +1880,7 @@
 	if (HaveDoc)
 	{
 		if (doc->appMode == modeMagnifier)
-			view->setCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
+			view->setCursor(IconManager::instance()->loadCursor("lupez.png"));
 	}
 	if (k->isAutoRepeat() || !m__arrowKeyDown)
 		return;
@@ -3184,7 +3184,7 @@
 		md->setUrls(urls);
 		QDrag* dr = new QDrag(this);
 		dr->setMimeData(md);
-		const QPixmap& dragCursor = IconManager::instance()->loadPixmap("DragPix.xpm");
+		const QPixmap& dragCursor = IconManager::instance()->loadPixmap("dragpix.png");
 		dr->setPixmap(dragCursor);
 		dr->exec();
 	}

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp	(original)
+++ trunk/Scribus/scribus/scribusview.cpp	Mon Jan 23 20:13:17 2017
@@ -516,41 +516,41 @@
 		case modeDrawSpiral:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawFrame.xpm"));
+			setCursor(im->loadCursor("drawframe.png"));
 			break;
 		case modeDrawImage:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawImageFrame.xpm"));
+			setCursor(im->loadCursor("drawimageframe.png"));
 			break;
 		case modeDrawLatex:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawLatexFrame.xpm"));
+			setCursor(im->loadCursor("drawlatexframe.png"));
 			break;
 		case modeDrawText:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawTextFrame.xpm"));
+			setCursor(im->loadCursor("drawtextframe.png"));
 			break;
 		case modeDrawTable2:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawTable.xpm"));
+			setCursor(im->loadCursor("drawtable.png"));
 			break;
 		case modeDrawRegularPolygon:
 			if (docSelectionCount!=0)
 				Deselect(true);
-			setCursor(im->loadCursor("DrawPolylineFrame.xpm"));
+			setCursor(im->loadCursor("drawpolylineframe.png"));
 			break;
 		case modeMagnifier:
 			if (docSelectionCount!=0)
 				Deselect(true);
 			Magnify = true;
-			setCursor(im->loadCursor("LupeZ.xpm"));
+			setCursor(im->loadCursor("lupez.png"));
 			break;
 		case modePanning:
-			setCursor(im->loadCursor("HandC.xpm"));
+			setCursor(im->loadCursor("handc.png"));
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -1754,7 +1754,7 @@
 {
 	m_dragTimerFired = true;
 	// #0007865
-// 	qApp->changeOverrideCursor(QCursor(loadIcon("DragPix.xpm")));
+// 	qApp->changeOverrideCursor(QCursor(loadIcon("dragpix.png")));
 }
 
 void ScribusView::HandleCurs(PageItem *currItem, QRect mpo)

Modified: trunk/Scribus/scribus/ui/AdapterWidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/AdapterWidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/AdapterWidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/AdapterWidget.cpp	Mon Jan 23 20:13:17 2017
@@ -69,7 +69,7 @@
 			button = 2;
 			break;
 		case Qt::RightButton:
-			qApp->setOverrideCursor(IconManager::instance()->loadCursor("LupeZ.xpm"));
+			qApp->setOverrideCursor(IconManager::instance()->loadCursor("lupez.png"));
 			button = 3;
 			break;
 		case Qt::NoButton:

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Mon Jan 23 20:13:17 2017
@@ -452,7 +452,7 @@
 	IconManager* im = IconManager::instance();
 	imageIcon = im->loadPixmap("22/insert-image.png");
 	latexIcon = im->loadPixmap("22/insert-latex.png");
-	lineIcon = im->loadPixmap("Stift.xpm");
+	lineIcon = im->loadPixmap("stift.png");
 	textIcon = im->loadPixmap("22/insert-text-frame.png");
 	polylineIcon = im->loadPixmap("22/draw-path.png");
 	polygonIcon = im->loadPixmap("22/draw-polygon.png");

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp	Mon Jan 23 20:13:17 2017
@@ -63,7 +63,7 @@
 	setupUi(this);
 
 	fontSize->setPrefix( "" );
-	fontSizeLabel->setPixmap(IconManager::instance()->loadPixmap("Zeichen.xpm"));
+	fontSizeLabel->setPixmap(IconManager::instance()->loadPixmap("zeichen.png"));
 	lineSpacingLabel->setPixmap(IconManager::instance()->loadPixmap("linespacing2.png"));
 
 	paraStyleLabel->setBuddy(paraStyleCombo);

Modified: trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/propertiespalette_textbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_textbase.ui	Mon Jan 23 20:13:17 2017
@@ -46,7 +46,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap>../../resources/icons/Zeichen.xpm</pixmap>
+        <pixmap>../../resources/icons/zeichen.png</pixmap>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -184,7 +184,7 @@
         <string>Paragraph St&yle:</string>
        </property>
        <property name="pixmap">
-        <pixmap>../../resources/icons/Zeichen.xpm</pixmap>
+        <pixmap>../../resources/icons/zeichen.png</pixmap>
        </property>
       </widget>
      </item>
@@ -237,7 +237,7 @@
         <string>Character St&yle:</string>
        </property>
        <property name="pixmap">
-        <pixmap>../../resources/icons/Zeichen.xpm</pixmap>
+        <pixmap>../../resources/icons/zeichen.png</pixmap>
        </property>
       </widget>
      </item>

Modified: trunk/Scribus/scribus/ui/scmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/scmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scmenu.cpp	(original)
+++ trunk/Scribus/scribus/ui/scmenu.cpp	Mon Jan 23 20:13:17 2017
@@ -166,7 +166,7 @@
 			}
 		}
 		if (newMenuAction->icon().isNull() && ! menuListHasNoIcons)
-			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.xpm"));
+			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.png"));
 #endif
 
 		menuItemList.append(newMenuAction);
@@ -201,7 +201,7 @@
 #ifdef Q_OS_MAC
 	if (newMenuAction && afterMenuAction)
 		if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
-			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.xpm"));
+			newMenuAction->setIcon(IconManager::instance()->loadIcon("noicon.png"));
 #endif
 		
 	int pos=menuItemList.indexOf(QPointer<QObject>(afterMenuAction));

Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp	Mon Jan 23 20:13:17 2017
@@ -22,7 +22,7 @@
 	setupUi(this);
 
 	IconManager* im = IconManager::instance();
-	fontSizeLabel_->setPixmap(im->loadPixmap("Zeichen.xpm"));
+	fontSizeLabel_->setPixmap(im->loadPixmap("zeichen.png"));
 	trackingLabel_->setPixmap(im->loadPixmap("textkern.png"));
 	widthSpaceLabel->setPixmap(im->loadPixmap("spacewidth.png"));
 	baselineOffsetLabel_->setPixmap(im->loadPixmap("textbase.png"));

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp	(original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp	Mon Jan 23 20:13:17 2017
@@ -1553,7 +1553,7 @@
 	m_spellActive=false;
 	prefsManager=PrefsManager::instance();
 #ifdef Q_OS_MAC
-	noIcon = IconManager::instance()->loadPixmap("noicon.xpm");
+	noIcon = IconManager::instance()->loadPixmap("noicon.png");
 #endif
 	buildGUI();
 	/*

Modified: trunk/Scribus/scribus/ui/styleselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/ui/styleselect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/styleselect.cpp	(original)
+++ trunk/Scribus/scribus/ui/styleselect.cpp	Mon Jan 23 20:13:17 2017
@@ -141,7 +141,7 @@
 	UnderlinePop->addAction(UnderlineValAct);
 	underlineButton = new QToolButton( this );
 	underlineButton->setText( "" );
-	underlineButton->setIcon(im->loadIcon("Unter.xpm"));
+	underlineButton->setIcon(im->loadIcon("unter.png"));
 	underlineButton->setCheckable( true );
 	underlineButton->setMenu(UnderlinePop);
 	underlineButton->setPopupMode(QToolButton::DelayedPopup);
@@ -156,12 +156,12 @@
 
 	subscriptButton = new QToolButton( this );
 	subscriptButton->setText( "" );
-	subscriptButton->setIcon(im->loadIcon("Tief.xpm"));
+	subscriptButton->setIcon(im->loadIcon("tief.png"));
 	subscriptButton->setCheckable( true );
 	ssLayout->addWidget( subscriptButton );
 	superscriptButton = new QToolButton( this );
 	superscriptButton->setText( "" );
-	superscriptButton->setIcon(im->loadIcon("Hoch.xpm"));
+	superscriptButton->setIcon(im->loadIcon("hoch.png"));
 	superscriptButton->setCheckable( true );
 	ssLayout->addWidget( superscriptButton );
 
@@ -173,7 +173,7 @@
 	ssLayout->addWidget( allcapsButton );
 	smallcapsButton = new QToolButton( this );
 	smallcapsButton->setText("");
-	smallcapsButton->setIcon(im->loadIcon("Kapital.xpm"));
+	smallcapsButton->setIcon(im->loadIcon("kapital.png"));
 	smallcapsButton->setCheckable( true );
 	ssLayout->addWidget( smallcapsButton );
 
@@ -184,7 +184,7 @@
 	StrikePop->addAction(StrikeValAct);
 	strikeoutButton = new QToolButton( this );
 	strikeoutButton->setText( "" );
-	strikeoutButton->setIcon(im->loadIcon("Strike.xpm"));
+	strikeoutButton->setIcon(im->loadIcon("strike.png"));
 	strikeoutButton->setCheckable( true );
 	strikeoutButton->setMenu(StrikePop);
 	strikeoutButton->setPopupMode(QToolButton::DelayedPopup);

Modified: trunk/Scribus/scribus/undomanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21740&path=/trunk/Scribus/scribus/undomanager.cpp
==============================================================================
--- trunk/Scribus/scribus/undomanager.cpp	(original)
+++ trunk/Scribus/scribus/undomanager.cpp	Mon Jan 23 20:13:17 2017
@@ -803,7 +803,7 @@
 	UndoManager::IImageFrame      = new QPixmap(iconDir + "16/insert-image.png");
 	UndoManager::ITextFrame       = new QPixmap(iconDir + "16/insert-text-frame.png");
 	UndoManager::ILatexFrame      = new QPixmap(iconDir + "16/insert-latex.png");
-	UndoManager::ILine            = new QPixmap(iconDir + "Stift.xpm");
+	UndoManager::ILine            = new QPixmap(iconDir + "stift.png");
 	UndoManager::IPolygon         = new QPixmap(iconDir + "16/draw-polygon.png");
 	UndoManager::IPolyline        = new QPixmap(iconDir + "16/draw-bezier-curves.png");
 // 	UndoManager::IPathText        = new QPixmap(iconDir + "?";




More information about the scribus-commit mailing list