r15015 by cbradney - Add document prefs only section tabs, doc sections and information

scribus-commit scribus-commit at lists.scribus.net
Mon Apr 26 23:20:31 CEST 2010


Revision: 15015
Author: cbradney
Date: 2010-04-26T21:10:22.134581Z
Commit message: Add document prefs only section tabs, doc sections and information

Changeset: 
A  /trunk/Scribus/scribus/ui/prefs_documentsectionsbase.ui
M  /trunk/Scribus/scribus/CMakeLists.txt
M  /trunk/Scribus/scribus/scribusdoc.cpp
A  /trunk/Scribus/scribus/ui/prefs_documentinformation.cpp
A  /trunk/Scribus/scribus/ui/prefs_documentsections.cpp
A  /trunk/Scribus/scribus/ui/prefs_documentinformation.h
A  /trunk/Scribus/scribus/ui/prefs_documentinformationbase.ui
A  /trunk/Scribus/scribus/ui/prefs_documentsections.h

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 15014)
+++ scribus/scribusdoc.cpp	(revision 15015)
@@ -12111,13 +12111,13 @@
 void ScribusDoc::setNewPrefs(const ApplicationPrefs& prefsData, const ApplicationPrefs& oldPrefsData)
 {
 	docPrefsData=prefsData;
-/*
+
 	double TopD = prefsData.displayPrefs.scratch.Top - oldPrefsData.displayPrefs.scratch.Top;
 	double LeftD = prefsData.displayPrefs.scratch.Left - oldPrefsData.displayPrefs.scratch.Left;
-
-	for (int p = 0; p < currDoc->Pages->count(); ++p)
+	/* TODO: pull in the make changes to all pages bools
+	for (int p = 0; p < Pages->count(); ++p)
 	{
-		Page *pp = currDoc->Pages->at(p);
+		Page *pp = Pages->at(p);
 		if (tabPage->sizeAllPages->isChecked())
 		{
 			pp->setInitialWidth(docPrefsData.docSetupPrefs.pageWidth);
@@ -12150,6 +12150,7 @@
 			}
 		}
 	}
+
 	for (int p = 0; p < MasterPages.count(); ++p)
 	{
 		Page *pp = MasterPages.at(p);
@@ -12170,6 +12171,7 @@
 		pp->setXOffset(docPrefsData.displayPrefs.scratch.Left);
 		pp->setYOffset(docPrefsData.displayPrefs.scratch.Top);
 	}
+	*/
 	uint docItemsCount = MasterItems.count();
 	for (uint ite = 0; ite < docItemsCount; ++ite)
 	{
@@ -12177,27 +12179,24 @@
 		item->moveBy(LeftD, TopD);
 		item->setRedrawBounding();
 	}
-	viewToRecalcPictureRes=(docPrefsData.itemToolPrefs.imageLowResType==oldPrefsData.itemToolPrefs.imageLowResType);
+	bool viewToRecalcPictureRes=(docPrefsData.itemToolPrefs.imageLowResType==oldPrefsData.itemToolPrefs.imageLowResType);
 
 	autoSaveTimer->stop();
 	if (docPrefsData.docSetupPrefs.AutoSave)
 		autoSaveTimer->start(docPrefsData.docSetupPrefs.AutoSaveTime);
-*/
+
 /*	FIXME: scribus determines dict by charstyle now, so this setting should go into the doc's default charstyle
 		currDoc->docHyphenator->slotNewDict(ScMW->GetLang(tabHyphenator->language->currentText()));
 */
-/*
-	currDoc->setHyphLanguage(docPrefsData.hyphPrefs.Language);
 
-	currDoc->docHyphenator->slotNewSettings(docPrefsData.hyphPrefs.MinWordLen,
+	docHyphenator->slotNewSettings(docPrefsData.hyphPrefs.MinWordLen,
 											!docPrefsData.hyphPrefs.Automatic,
 											docPrefsData.hyphPrefs.AutoCheck,
 											docPrefsData.hyphPrefs.HyCount);
-	currDoc->docHyphenator->ignoredWords = docPrefsData.hyphPrefs.ignoredWords;
-	currDoc->docHyphenator->specialWords = docPrefsData.hyphPrefs.specialWords;
+	docHyphenator->ignoredWords = docPrefsData.hyphPrefs.ignoredWords;
+	docHyphenator->specialWords = docPrefsData.hyphPrefs.specialWords;
 	if (ScCore->haveCMS())
 	{
-		bool oldCM = currDoc->docPrefsData.colorPrefs.DCMSset.CMSinUse;
 		bool cmsChanged = (
 					(docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile != oldPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile) ||
 					(docPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile != oldPrefsData.colorPrefs.DCMSset.DefaultImageCMYKProfile) ||
@@ -12214,25 +12213,25 @@
 					);
 		if (cmsChanged)
 		{
-			ScMW->setStatusBarInfoText( tr("Adjusting Colors"));
-			ScMW->mainWindowProgressBar->reset();
+			m_ScMW->setStatusBarInfoText( tr("Adjusting Colors"));
+			m_ScMW->mainWindowProgressBar->reset();
 			int cc = PageColors.count() + Items->count();
-			ScMW->mainWindowProgressBar->setMaximum(cc);
+			m_ScMW->mainWindowProgressBar->setMaximum(cc);
 			qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
-			bool newCM  = CMSSettings.CMSinUse;
+			bool newCM  = docPrefsData.colorPrefs.DCMSset.CMSinUse;
 			bool updCol = false;
-			CMSSettings.CMSinUse = oldCM;
+			docPrefsData.colorPrefs.DCMSset.CMSinUse = oldPrefsData.colorPrefs.DCMSset.CMSinUse;
 			CloseCMSProfiles();
-			CMSSettings.CMSinUse = newCM;
-			HasCMS = CMSSettings.CMSinUse;
-			SoftProofing = CMSSettings.SoftProofOn;
-			Gamut = CMSSettings.GamutCheck;
-			IntentColors = CMSSettings.DefaultIntentColors;
-			IntentImages = CMSSettings.DefaultIntentImages;
-			if (!CMSSettings.CMSinUse)
+			docPrefsData.colorPrefs.DCMSset.CMSinUse = newCM;
+			HasCMS = docPrefsData.colorPrefs.DCMSset.CMSinUse;
+			SoftProofing = docPrefsData.colorPrefs.DCMSset.SoftProofOn;
+			Gamut = docPrefsData.colorPrefs.DCMSset.GamutCheck;
+			IntentColors = docPrefsData.colorPrefs.DCMSset.DefaultIntentColors;
+			IntentImages = docPrefsData.colorPrefs.DCMSset.DefaultIntentImages;
+			if (!docPrefsData.colorPrefs.DCMSset.CMSinUse)
 			{
 				HasCMS = false;
-				if	(oldCM)
+				if	(oldPrefsData.colorPrefs.DCMSset.CMSinUse)
 				{
 					SetDefaultCMSParams();
 					updCol = true;
@@ -12241,11 +12240,11 @@
 			else if ( OpenCMSProfiles(ScCore->InputProfiles, ScCore->InputProfilesCMYK, ScCore->MonitorProfiles, ScCore->PrinterProfiles) )
 			{
 				HasCMS = true;
-				docPrefsData.pdfPrefs.SComp = CMSSettings.ComponentsInput2;
-				docPrefsData.pdfPrefs.SolidProf = CMSSettings.DefaultSolidColorRGBProfile;
-				docPrefsData.pdfPrefs.ImageProf = CMSSettings.DefaultImageRGBProfile;
-				docPrefsData.pdfPrefs.PrintProf = CMSSettings.DefaultPrinterProfile;
-				docPrefsData.pdfPrefs.Intent = CMSSettings.DefaultIntentColors;
+				docPrefsData.pdfPrefs.SComp = docPrefsData.colorPrefs.DCMSset.ComponentsInput2;
+				docPrefsData.pdfPrefs.SolidProf = docPrefsData.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
+				docPrefsData.pdfPrefs.ImageProf = docPrefsData.colorPrefs.DCMSset.DefaultImageRGBProfile;
+				docPrefsData.pdfPrefs.PrintProf = docPrefsData.colorPrefs.DCMSset.DefaultPrinterProfile;
+				docPrefsData.pdfPrefs.Intent = docPrefsData.colorPrefs.DCMSset.DefaultIntentColors;
 				updCol = true;
 			}
 			else
@@ -12255,110 +12254,37 @@
 			}
 			if (updCol)
 			{
-				ScMW->recalcColors(ScMW->mainWindowProgressBar);
-				RecalcPictures(&ScCore->InputProfiles, &ScCore->InputProfilesCMYK, ScMW->mainWindowProgressBar);
+				m_ScMW->recalcColors(m_ScMW->mainWindowProgressBar);
+				RecalcPictures(&ScCore->InputProfiles, &ScCore->InputProfilesCMYK, m_ScMW->mainWindowProgressBar);
 			}
-			ScMW->mainWindowProgressBar->setValue(cc);
+			m_ScMW->mainWindowProgressBar->setValue(cc);
 			qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
-			ScMW->setStatusBarInfoText("");
-			ScMW->mainWindowProgressBar->reset();
+			m_ScMW->setStatusBarInfoText("");
+			m_ScMW->mainWindowProgressBar->reset();
 		}
 	}
 	PrefsManager* prefsManager=PrefsManager::instance();
-// 	SCFontsIterator it(prefsManager->appPrefs.AvailFonts);
-// 	for ( ; it.hasNext() ; it.next())
-// 	{
-// 		it.current().embedPs(tabFonts->fontFlags[it.currentKey()].FlagPS);
-// 		it.current().usable(tabFonts->fontFlags[it.currentKey()].FlagUse);
-// 		it.current().subset(tabFonts->fontFlags[it.currentKey()].FlagSub);
-// 	}
-	uint a = 0;
-	prefsManager->appPrefs.fontPrefs.GFontSub.clear();
-	QMap<QString,QString>::Iterator itfsu;
-	QMap<QString,QString>::Iterator itfsuend=tabFonts->RList.end();
-	for (itfsu = tabFonts->RList.begin(); itfsu != itfsuend; ++itfsu)
-		prefsManager->appPrefs.fontPrefs.GFontSub[itfsu.key()] = tabFonts->FlagsRepl.at(a++)->currentText();
-	QStringList uf = currDoc->UsedFonts.keys();
+
+	QStringList uf(UsedFonts.keys());
 	QMap<QString,int>::Iterator it3;
-//	for (it3 = currDoc->UsedFonts.begin(); it3 != currDoc->UsedFonts.end(); ++it3)
-//		FT_Done_Face(currDoc->FFonts[it3.key()]);
-	currDoc->UsedFonts.clear();
+	UsedFonts.clear();
 	QStringList::Iterator it3a;
 	QStringList::Iterator it3aend=uf.end();
 	for (it3a = uf.begin(); it3a != it3aend; ++it3a)
-		currDoc->AddFont(*it3a);
+		AddFont(*it3a);
 
 
-	if (tabPDF->Encry->isChecked())
-	{
-		int Perm = -64;
-		if (tabPDF->PDFVersionCombo->currentIndex() == 1)
-			Perm &= ~0x00240000;
-		if (tabPDF->PrintSec->isChecked())
-			Perm += 4;
-		if (tabPDF->ModifySec->isChecked())
-			Perm += 8;
-		if (tabPDF->CopySec->isChecked())
-			Perm += 16;
-		if (tabPDF->AddSec->isChecked())
-			Perm += 32;
-		currDoc->pdfOptions().Permissions = Perm;
-		currDoc->pdfOptions().PassOwner = tabPDF->PassOwner->text();
-		currDoc->pdfOptions().PassUser = tabPDF->PassUser->text();
-	}
-	if (tabPDF->PDFVersionCombo->currentIndex() == 0)
-		currDoc->pdfOptions().Version = PDFOptions::PDFVersion_13;
-	if (tabPDF->PDFVersionCombo->currentIndex() == 1)
-		currDoc->pdfOptions().Version = PDFOptions::PDFVersion_14;
-	if (tabPDF->PDFVersionCombo->currentIndex() == 2)
-		currDoc->pdfOptions().Version = PDFOptions::PDFVersion_15;
-	if (tabPDF->PDFVersionCombo->currentIndex() == 3)
-		currDoc->pdfOptions().Version = PDFOptions::PDFVersion_X3;
-	if (tabPDF->OutCombo->currentIndex() == 0)
-	{
-		currDoc->pdfOptions().isGrayscale = false;
-		currDoc->pdfOptions().UseRGB = true;
-		currDoc->pdfOptions().UseProfiles = false;
-		currDoc->pdfOptions().UseProfiles2 = false;
-	}
-	else
-	{
-		if (tabPDF->OutCombo->currentIndex() == 3)
-		{
-			currDoc->pdfOptions().isGrayscale = true;
-			currDoc->pdfOptions().UseRGB = false;
-			currDoc->pdfOptions().UseProfiles = false;
-			currDoc->pdfOptions().UseProfiles2 = false;
-		}
-		else
-		{
-			currDoc->pdfOptions().isGrayscale = false;
-			currDoc->pdfOptions().UseRGB = false;
-			if (currDoc->HasCMS)
-			{
-				currDoc->pdfOptions().UseProfiles = tabPDF->EmbedProfs->isChecked();
-				currDoc->pdfOptions().UseProfiles2 = tabPDF->EmbedProfs2->isChecked();
-				currDoc->pdfOptions().Intent = tabPDF->IntendS->currentIndex();
-				currDoc->pdfOptions().Intent2 = tabPDF->IntendI->currentIndex();
-				currDoc->pdfOptions().EmbeddedI = tabPDF->NoEmbedded->isChecked();
-				currDoc->pdfOptions().SolidProf = tabPDF->SolidPr->currentText();
-				currDoc->pdfOptions().ImageProf = tabPDF->ImageP->currentText();
-				currDoc->pdfOptions().PrintProf = tabPDF->PrintProfC->currentText();
-			}
-		}
-	}
 
-	currDoc->documentInfo = docInfos->getDocInfo();
-	currDoc->setItemAttributes(*(tabDocItemAttributes->getNewAttributes()));
-	currDoc->setTocSetups(*(tabTOCIndexPrefs->getNewToCs()));
-	currDoc->sections = tabDocSections->getNewSections();
+//	currDoc->documentInfo = docInfos->getDocInfo();
+//	currDoc->sections = tabDocSections->getNewSections();
 
-	uint itemCount=currDoc->Items->count();
+
+	uint itemCount=Items->count();
 	for (uint b=0; b<itemCount; ++b)
 	{
-		if (currDoc->Items->at(b)->itemType() == PageItem::ImageFrame)
-			currDoc->Items->at(b)->setImageShown(currDoc->guidesPrefs().showPic);
+		if (Items->at(b)->itemType() == PageItem::ImageFrame)
+			Items->at(b)->setImageShown(docPrefsData.guidesPrefs.showPic);
 	}
-	*/
+
 }
 
Index: scribus/ui/prefs_documentinformationbase.ui
===================================================================
--- scribus/ui/prefs_documentinformationbase.ui	(revision 0)
+++ scribus/ui/prefs_documentinformationbase.ui	(revision 15015)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Prefs_DocumentInformation</class>
+ <widget class="QWidget" name="Prefs_DocumentInformation">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>631</width>
+    <height>646</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="tabDocument">
+      <attribute name="title">
+       <string>Document</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Title:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="titleLineEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Author:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="authorLineEdit"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Subject:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="subjectLineEdit"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Keywords:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QTextEdit" name="keywordsTextEdit"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Description:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QTextEdit" name="descriptionTextEdit"/>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tabFurtherInformation">
+      <attribute name="title">
+       <string>Further Information</string>
+      </attribute>
+      <layout class="QFormLayout" name="formLayout_2">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>Publisher:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="publisherLineEdit"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Contributors:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QTextEdit" name="contributorsTextEdit"/>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Date:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="dateLineEdit"/>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="typeLineEdit"/>
+       </item>
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_11">
+         <property name="text">
+          <string>Format:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="formatLineEdit"/>
+       </item>
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_12">
+         <property name="text">
+          <string>Identifier:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QLineEdit" name="identifierLineEdit"/>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_13">
+         <property name="text">
+          <string>Source:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="sourceLineEdit"/>
+       </item>
+       <item row="7" column="0">
+        <widget class="QLabel" name="label_14">
+         <property name="text">
+          <string>Language:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="1">
+        <widget class="QLineEdit" name="languageLineEdit"/>
+       </item>
+       <item row="8" column="0">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>Relation:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QLineEdit" name="relationLineEdit"/>
+       </item>
+       <item row="9" column="0">
+        <widget class="QLabel" name="label_16">
+         <property name="text">
+          <string>Coverage:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QLineEdit" name="coverageLineEdit"/>
+       </item>
+       <item row="10" column="0">
+        <widget class="QLabel" name="label_17">
+         <property name="text">
+          <string>Rights:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="1">
+        <widget class="QLineEdit" name="rightsLineEdit"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/ui/prefs_documentsectionsbase.ui
===================================================================
--- scribus/ui/prefs_documentsectionsbase.ui	(revision 0)
+++ scribus/ui/prefs_documentsectionsbase.ui	(revision 15015)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Prefs_DocumentSections</class>
+ <widget class="QWidget" name="Prefs_DocumentSections">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>694</width>
+    <height>308</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Document Sections</string>
+  </property>
+  <layout class="QVBoxLayout">
+   <item>
+    <widget class="QLabel" name="titleLabel">
+     <property name="font">
+      <font>
+       <pointsize>14</pointsize>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Document Sections</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="ScTableWidget" name="sectionsTable">
+     <property name="numRows" stdset="0">
+      <number>0</number>
+     </property>
+     <property name="numCols" stdset="0">
+      <number>6</number>
+     </property>
+     <column>
+      <property name="text">
+       <string>Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Shown</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>From</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>To</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Style</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Start</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>192</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="addButton">
+       <property name="text">
+        <string>&amp;Add</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+A</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="deleteButton">
+       <property name="text">
+        <string>&amp;Delete</string>
+       </property>
+       <property name="shortcut">
+        <string>Alt+D</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>ScTableWidget</class>
+   <extends>QTableWidget</extends>
+   <header>ui/sctablewidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
Index: scribus/ui/prefs_documentsections.h
===================================================================
--- scribus/ui/prefs_documentsections.h	(revision 0)
+++ scribus/ui/prefs_documentsections.h	(revision 15015)
@@ -0,0 +1,29 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_DOCUMENTSECTIONS_H
+#define PREFS_DOCUMENTSECTIONS_H
+
+#include "ui_prefs_documentsectionsbase.h"
+#include "prefs_pane.h"
+#include "scribusapi.h"
+
+class SCRIBUS_API Prefs_DocumentSections : public Prefs_Pane, Ui::Prefs_DocumentSections
+{
+	Q_OBJECT
+
+	public:
+		Prefs_DocumentSections(QWidget* parent=0);
+		~Prefs_DocumentSections();
+		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
+		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
+
+	public slots:
+		void languageChange();
+};
+
+#endif // PREFS_DOCUMENTSECTIONS_H

Property changes on: scribus/ui/prefs_documentsections.h
___________________________________________________________________
Added: svn:eol-style
   + native

Index: scribus/ui/prefs_documentsections.cpp
===================================================================
--- scribus/ui/prefs_documentsections.cpp	(revision 0)
+++ scribus/ui/prefs_documentsections.cpp	(revision 15015)
@@ -0,0 +1,35 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#include "prefs_documentsections.h"
+#include "prefsstructs.h"
+
+Prefs_DocumentSections::Prefs_DocumentSections(QWidget* parent)
+	: Prefs_Pane(parent)
+{
+	setupUi(this);
+	languageChange();
+}
+
+Prefs_DocumentSections::~Prefs_DocumentSections()
+{
+}
+
+void Prefs_DocumentSections::languageChange()
+{
+}
+
+void Prefs_DocumentSections::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+//	autoSendCopiedToScrapCheckBox->setChecked(prefsData->scrapbookPrefs.doCopyToScrapbook);
+}
+
+void Prefs_DocumentSections::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+{
+//	prefsData->scrapbookPrefs.doCopyToScrapbook=autoSendCopiedToScrapCheckBox->isChecked();
+}
+

Property changes on: scribus/ui/prefs_documentsections.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Index: scribus/ui/prefs_documentinformation.h
===================================================================
--- scribus/ui/prefs_documentinformation.h	(revision 0)
+++ scribus/ui/prefs_documentinformation.h	(revision 15015)
@@ -0,0 +1,29 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#ifndef PREFS_DOCUMENTINFORMATION_H
+#define PREFS_DOCUMENTINFORMATION_H
+
+#include "ui_prefs_documentinformationbase.h"
+#include "prefs_pane.h"
+#include "scribusapi.h"
+
+class SCRIBUS_API Prefs_DocumentInformation : public Prefs_Pane, Ui::Prefs_DocumentInformation
+{
+	Q_OBJECT
+
+	public:
+		Prefs_DocumentInformation(QWidget* parent=0);
+		~Prefs_DocumentInformation();
+		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
+		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
+
+	public slots:
+		void languageChange();
+};
+
+#endif // PREFS_DOCUMENTINFORMATION_H

Property changes on: scribus/ui/prefs_documentinformation.h
___________________________________________________________________
Added: svn:eol-style
   + native

Index: scribus/ui/prefs_documentinformation.cpp
===================================================================
--- scribus/ui/prefs_documentinformation.cpp	(revision 0)
+++ scribus/ui/prefs_documentinformation.cpp	(revision 15015)
@@ -0,0 +1,35 @@
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+a copyright and/or license notice that predates the release of Scribus 1.3.2
+for which a new license (GPL+exception) is in place.
+*/
+
+#include "prefs_documentinformation.h"
+#include "prefsstructs.h"
+
+Prefs_DocumentInformation::Prefs_DocumentInformation(QWidget* parent)
+	: Prefs_Pane(parent)
+{
+	setupUi(this);
+	languageChange();
+}
+
+Prefs_DocumentInformation::~Prefs_DocumentInformation()
+{
+}
+
+void Prefs_DocumentInformation::languageChange()
+{
+}
+
+void Prefs_DocumentInformation::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+//	autoSendCopiedToScrapCheckBox->setChecked(prefsData->scrapbookPrefs.doCopyToScrapbook);
+}
+
+void Prefs_DocumentInformation::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+{
+//	prefsData->scrapbookPrefs.doCopyToScrapbook=autoSendCopiedToScrapCheckBox->isChecked();
+}
+

Property changes on: scribus/ui/prefs_documentinformation.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt	(revision 15014)
+++ scribus/CMakeLists.txt	(revision 15015)
@@ -98,6 +98,8 @@
   ui/preferencesdialogbase.ui
   ui/prefs_colormanagementbase.ui
   ui/prefs_displaybase.ui
+  ui/prefs_documentinformationbase.ui
+  ui/prefs_documentsectionsbase.ui
   ui/prefs_documentsetupbase.ui
   ui/prefs_externaltoolsbase.ui
   ui/prefs_fontsbase.ui
@@ -289,6 +291,8 @@
   ui/preferencesdialog.h
   ui/prefs_colormanagement.h
   ui/prefs_display.h
+  ui/prefs_documentinformation.h
+  ui/prefs_documentsections.h
   ui/prefs_documentsetup.h
   ui/prefs_externaltools.h
   ui/prefs_fonts.h
@@ -606,6 +610,8 @@
   ui/preferencesdialog.cpp
   ui/prefs_colormanagement.cpp
   ui/prefs_display.cpp
+  ui/prefs_documentinformation.cpp
+  ui/prefs_documentsections.cpp
   ui/prefs_documentsetup.cpp
   ui/prefs_externaltools.cpp
   ui/prefs_fonts.cpp




More information about the scribus-commit mailing list