Attachment #818 for bug #1215

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1215
Collapse All | Expand All




			<whatsthis></whatsthis>
			<default>true</default>
		</entry>
    <entry name="WatchFile" type="Bool">
      <label>Watch File</label>
      <whatsthis>If this is on, then the file will be reloaded whenever it changes on disk</whatsthis>
      <default>false</default>
    </entry>
    <entry name="RetainDocumentData" type="Bool">
      <label>Retain document viewing data</label>
      <whatsthis>If this is on, then document viewing options are retained</whatsthis>
      <default>true</default>
    </entry>
	</group>
	<group name="Ghostscript">
		<entry name="Interpreter" type="String">




                            </property>
                        </widget>
                        <widget class="TQCheckBox">
                          <property name="name">
                            <cstring>kcfg_WatchFile</cstring>
                          </property>
                          <property name="text">
                            <string>&amp;Watch file</string>
                          </property>
                        </widget>
                        <widget class="TQCheckBox">
                          <property name="name">
                            <cstring>kcfg_RetainDocumentData</cstring>
                          </property>
                          <property name="text">
                            <string>&amp;Retain document viewing data</string>
                          </property>
                        </widget>
                    </vbox>
                </widget>

Lines 54-60 Link Here

(-)tdegraphics/kpdf/conf/kpdf.kcfg (-1 / +4 lines)
54	<default>true</default>	54	<default>true</default>
55	</entry>	55	</entry>
56	<entry key="ObeyDRM" type="Bool" >	56	<entry key="ObeyDRM" type="Bool" >
57	<default>true</default>	57	<default>true</default>
		58	</entry>
		59	<entry key="RetainDocumentData" type="Bool" >
		60	<default>true</default>
58	</entry>	61	</entry>
59	</group>	62	</group>
60	<group name="MainView" >	63	<group name="MainView" >




    if ( d->docFileName.isNull() )
        return;

    if ( KpdfSettings::retainDocumentData() )
    if (infoFile.open( IO_WriteOnly | IO_Truncate) )
    {
      TQFile infoFile( d->xmlFileName );
      if (infoFile.open( IO_WriteOnly | IO_Truncate) )
      {
          // Create DOM
          TQDomDocument doc( "documentInfo" );
          TQDomElement root = doc.createElement( "documentInfo" );
          doc.appendChild( root );
  
          // Add bookmark list to DOM
          TQDomElement bookmarkList = doc.createElement( "bookmarkList" );
          root.appendChild( bookmarkList );
  
          for ( uint i = 0; i < pages_vector.count() ; i++ )
          {
              if ( pages_vector[i]->hasBookmark() )
              {
                  TQDomElement page = doc.createElement( "page" );
                  page.appendChild( doc.createTextNode( TQString::number(i) ) );
  
                  bookmarkList.appendChild( page );
              }
          }
  
          // Add general info to DOM
          TQDomElement generalInfo = doc.createElement( "generalInfo" );
          root.appendChild( generalInfo );
  
          // <general info><history> ... </history> saves history up to 10 viewports
          TQValueList< DocumentViewport >::iterator backIterator = d->viewportIterator;
          if ( backIterator != d->viewportHistory.end() )
          {
              // go back up to 10 steps from the current viewportIterator
              int backSteps = 10;
              while ( backSteps-- && backIterator != d->viewportHistory.begin() )
                  --backIterator;
  
              // create history root node
              TQDomElement historyNode = doc.createElement( "history" );
              generalInfo.appendChild( historyNode );
  
              // add old[backIterator] and present[viewportIterator] items
              TQValueList< DocumentViewport >::iterator endIt = d->viewportIterator;
              ++endIt;
              while ( backIterator != endIt )
              {
                  TQString name = (backIterator == d->viewportIterator) ? "current" : "oldPage";
                  TQDomElement historyEntry = doc.createElement( name );
                  historyEntry.setAttribute( "viewport", (*backIterator).toString() );
                  historyNode.appendChild( historyEntry );
                  ++backIterator;
              }
          }
  
          // Save DOM to XML file
          TQString xml = doc.toString();
          TQTextStream os( &infoFile );
          os << xml;
      }
      infoFile.close();
    }
    infoFile.close();
}

void KPDFDocument::slotTimedMemoryCheck()

Lines 11-16 Link Here

(-)tdegraphics/kviewshell/kviewshell.kcfg (+3 lines)
11	<entry key="WatchFile" type="Bool">	11	<entry key="WatchFile" type="Bool">
12	<default>true</default>	12	<default>true</default>
13	</entry>	13	</entry>
		14	<entry key="RetainDocumentData" type="Bool">
		15	<default>true</default>
		16	</entry>
14	<entry key="Zoom" type="Double">	17	<entry key="Zoom" type="Double">
15	<default>1.0</default>	18	<default>1.0</default>
16	</entry>	19	</entry>

Return to bug 1215

Lines 85-96 Link Here

(-)tdegraphics/kpdf/conf/dlggeneral.ui (-6 / +14 lines)
85	</property>	85	</property>
86	</widget>	86	</widget>
87	<widget class="TQCheckBox">	87	<widget class="TQCheckBox">
88	<property name="name">	88	<property name="name">
89	<cstring>kcfg_WatchFile</cstring>	89	<cstring>kcfg_WatchFile</cstring>
90	</property>	90	</property>
91	<property name="text">	91	<property name="text">
92	<string>&Watch file</string>	92	<string>&Watch file</string>
93	</property>	93	</property>
		94	</widget>
		95	<widget class="TQCheckBox">
		96	<property name="name">
		97	<cstring>kcfg_RetainDocumentData</cstring>
		98	</property>
		99	<property name="text">
		100	<string>&Retain document viewing data</string>
		101	</property>
94	</widget>	102	</widget>
95	</vbox>	103	</vbox>
96	</widget>	104	</widget>

Lines 1404-1468 Link Here

(-)tdegraphics/kpdf/core/document.cpp (-57 / +60 lines)
1404	if ( d->docFileName.isNull() )	1404	if ( d->docFileName.isNull() )
1405	return;	1405	return;
1406		1406
1407	TQFile infoFile( d->xmlFileName );	1407	if ( KpdfSettings::retainDocumentData() )
1408	if (infoFile.open( IO_WriteOnly \| IO_Truncate) )
1409	{	1408	{
1410	// Create DOM	1409	TQFile infoFile( d->xmlFileName );
1411	TQDomDocument doc( "documentInfo" );	1410	if (infoFile.open( IO_WriteOnly \| IO_Truncate) )
1412	TQDomElement root = doc.createElement( "documentInfo" );	1411	{
1413	doc.appendChild( root );	1412	// Create DOM
1414		1413	TQDomDocument doc( "documentInfo" );
1415	// Add bookmark list to DOM	1414	TQDomElement root = doc.createElement( "documentInfo" );
1416	TQDomElement bookmarkList = doc.createElement( "bookmarkList" );	1415	doc.appendChild( root );
1417	root.appendChild( bookmarkList );	1416
1418		1417	// Add bookmark list to DOM
1419	for ( uint i = 0; i < pages_vector.count() ; i++ )	1418	TQDomElement bookmarkList = doc.createElement( "bookmarkList" );
1420	{	1419	root.appendChild( bookmarkList );
1421	if ( pages_vector[i]->hasBookmark() )	1420
1422	{	1421	for ( uint i = 0; i < pages_vector.count() ; i++ )
1423	TQDomElement page = doc.createElement( "page" );	1422	{
1424	page.appendChild( doc.createTextNode( TQString::number(i) ) );	1423	if ( pages_vector[i]->hasBookmark() )
1425		1424	{
1426	bookmarkList.appendChild( page );	1425	TQDomElement page = doc.createElement( "page" );
1427	}	1426	page.appendChild( doc.createTextNode( TQString::number(i) ) );
1428	}	1427
1429		1428	bookmarkList.appendChild( page );
1430	// Add general info to DOM	1429	}
1431	TQDomElement generalInfo = doc.createElement( "generalInfo" );	1430	}
1432	root.appendChild( generalInfo );	1431
1433		1432	// Add general info to DOM
1434	// <general info><history> ... </history> saves history up to 10 viewports	1433	TQDomElement generalInfo = doc.createElement( "generalInfo" );
1435	TQValueList< DocumentViewport >::iterator backIterator = d->viewportIterator;	1434	root.appendChild( generalInfo );
1436	if ( backIterator != d->viewportHistory.end() )	1435
1437	{	1436	// <general info><history> ... </history> saves history up to 10 viewports
1438	// go back up to 10 steps from the current viewportIterator	1437	TQValueList< DocumentViewport >::iterator backIterator = d->viewportIterator;
1439	int backSteps = 10;	1438	if ( backIterator != d->viewportHistory.end() )
1440	while ( backSteps-- && backIterator != d->viewportHistory.begin() )	1439	{
1441	--backIterator;	1440	// go back up to 10 steps from the current viewportIterator
1442		1441	int backSteps = 10;
1443	// create history root node	1442	while ( backSteps-- && backIterator != d->viewportHistory.begin() )
1444	TQDomElement historyNode = doc.createElement( "history" );	1443	--backIterator;
1445	generalInfo.appendChild( historyNode );	1444
1446		1445	// create history root node
1447	// add old[backIterator] and present[viewportIterator] items	1446	TQDomElement historyNode = doc.createElement( "history" );
1448	TQValueList< DocumentViewport >::iterator endIt = d->viewportIterator;	1447	generalInfo.appendChild( historyNode );
1449	++endIt;	1448
1450	while ( backIterator != endIt )	1449	// add old[backIterator] and present[viewportIterator] items
1451	{	1450	TQValueList< DocumentViewport >::iterator endIt = d->viewportIterator;
1452	TQString name = (backIterator == d->viewportIterator) ? "current" : "oldPage";	1451	++endIt;
1453	TQDomElement historyEntry = doc.createElement( name );	1452	while ( backIterator != endIt )
1454	historyEntry.setAttribute( "viewport", (*backIterator).toString() );	1453	{
1455	historyNode.appendChild( historyEntry );	1454	TQString name = (backIterator == d->viewportIterator) ? "current" : "oldPage";
1456	++backIterator;	1455	TQDomElement historyEntry = doc.createElement( name );
1457	}	1456	historyEntry.setAttribute( "viewport", (*backIterator).toString() );
1458	}	1457	historyNode.appendChild( historyEntry );
1459		1458	++backIterator;
1460	// Save DOM to XML file	1459	}
1461	TQString xml = doc.toString();	1460	}
1462	TQTextStream os( &infoFile );	1461
1463	os << xml;	1462	// Save DOM to XML file
		1463	TQString xml = doc.toString();
		1464	TQTextStream os( &infoFile );
		1465	os << xml;
		1466	}
		1467	infoFile.close();
1464	}	1468	}
1465	infoFile.close();
1466	}	1469	}
1467		1470
1468	void KPDFDocument::slotTimedMemoryCheck()	1471	void KPDFDocument::slotTimedMemoryCheck()

Lines 41-51 Link Here

(-)tdegraphics/kghostview/kghostview.kcfg (-5 / +10 lines)
41	<whatsthis></whatsthis>	41	<whatsthis></whatsthis>
42	<default>true</default>	42	<default>true</default>
43	</entry>	43	</entry>
44	<entry name="WatchFile" type="Bool">	44	<entry name="WatchFile" type="Bool">
45	<label>Watch File</label>	45	<label>Watch File</label>
46	<whatsthis>If this is on, then the file will be reloaded whenever it changes on disk</whatsthis>	46	<whatsthis>If this is on, then the file will be reloaded whenever it changes on disk</whatsthis>
47	<default>false</default>	47	<default>false</default>
48	</entry>	48	</entry>
		49	<entry name="RetainDocumentData" type="Bool">
		50	<label>Retain document viewing data</label>
		51	<whatsthis>If this is on, then document viewing options are retained</whatsthis>
		52	<default>true</default>
		53	</entry>
49	</group>	54	</group>
50	<group name="Ghostscript">	55	<group name="Ghostscript">
51	<entry name="Interpreter" type="String">	56	<entry name="Interpreter" type="String">