[desigle commit] r35 - trunk

1 view
Skip to first unread message

codesite...@google.com

unread,
Apr 28, 2008, 11:58:01 AM4/28/08
to desigle...@googlegroups.com
Author: pub...@kered.org
Date: Mon Apr 28 08:57:10 2008
New Revision: 35

Modified:
trunk/desigle.glade
trunk/desigle.py

Log:
added "auto-add document tags to previews not containing them" option
this is so previews of component documents work.


Modified: trunk/desigle.glade
==============================================================================
--- trunk/desigle.glade (original)
+++ trunk/desigle.glade Mon Apr 28 08:57:10 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.2 on Thu Apr 24 12:13:01 2008 -->
+<!--Generated with glade3 3.4.2 on Mon Apr 28 10:53:49 2008 -->
<glade-interface>
<widget class="GtkWindow" id="desigle">
<property name="width_request">800</property>
@@ -498,7 +498,7 @@
</child>
</widget>
<widget class="GtkDialog" id="desigle_prefs">
- <property name="width_request">500</property>
+ <property name="width_request">600</property>
<property name="height_request">400</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">DeSiGLE Preferences</property>
@@ -513,6 +513,7 @@
<widget class="GtkNotebook" id="notebook2">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tab_pos">GTK_POS_LEFT</property>
<child>
<widget class="GtkVBox" id="vbox4">
<property name="visible">True</property>
@@ -520,8 +521,10 @@
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">4</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<widget class="GtkTextView" id="textview_default_blank_document">
<property name="visible">True</property>
@@ -556,10 +559,109 @@
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes">Default
Blank Document</property>
+ <property name="label" translatable="yes">Blank Document</property>
</widget>
<packing>
<property name="type">tab</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="border_width">4</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkCheckButton" id="pref_auto_add_doc_tags_in_preview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Auto-add
document tags when previewing include documents</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Default document class:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="pref_default_doc_class">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="reset_pref_default_doc_class">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip"
translatable="yes">Revert to Default</property>
+ <property name="relief">GTK_RELIEF_NONE</property>
+ <property name="response_id">0</property>
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-revert-to-saved</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="pref_keep_preview_on_parent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Keep
preview on parent document when the current document is included in
+another (open) document</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">PDF Preview</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>

Modified: trunk/desigle.py
==============================================================================
--- trunk/desigle.py (original)
+++ trunk/desigle.py Mon Apr 28 08:57:10 2008
@@ -87,6 +87,7 @@
undo_stack = []
record_operations = True
editor = None
+ error_line_offset = 0

def __init__(self, main_gui, filename=None):
self.main_gui = main_gui
@@ -653,7 +654,8 @@
if line.startswith('! LaTeX Error:'):
self.errors.append( ( 'LaTeX Error', 0, line ) )
for match in p.finditer(line):
- self.errors.append( ( match.group(1),
int(match.group(2)), match.group(3) ) )
+ error_line = self.error_line_offset + int(match.group(2))
+ self.errors.append( ( match.group(1), error_line,
match.group(3) ) )

try:
self.treeview_errors_model.clear()
@@ -670,6 +672,12 @@
if not self.tex_docs: return
text_buffer = self.get_current_tex_doc().editor.get_buffer()
tex = text_buffer.get_text( text_buffer.get_start_iter(),
text_buffer.get_end_iter() )
+ if self.config.get_bool( 'pref_auto_add_doc_tags_in_preview')
and tex.find('\\documentclass')==-1:
+ tex = '\\documentclass{%s}\n\\begin{document}\n' %
self.config.get_string( 'default_doc_class', default='article' ) \
+ + tex + '\n\\end{document}\n'
+ self.error_line_offset = -2
+ else:
+ self.error_line_offset = 0
ftex = open( self.tex_file, 'w' )
ftex.write( tex )
ftex.close()
@@ -853,10 +861,23 @@
self.main_window.connect("delete-event", lambda x,y:
self.main_window.destroy() )
self.ui.get_widget('button_close').connect('clicked', lambda
x: self.main_window.destroy() )

+ # blank document
textview_default_blank_document = self.ui.get_widget('textview_default_blank_document')
textview_default_blank_document.get_buffer().set_text(
self.config.get_string( 'default_blank_document',
default=BLANK_DOCUMENT ) )

textview_default_blank_document.get_buffer().connect('changed',
self.save_default_blank_document )

self.ui.get_widget('toolbutton_revert_to_default').connect( 'clicked',
lambda x:
self.ui.get_widget('textview_default_blank_document').get_buffer().set_text(
BLANK_DOCUMENT ) )
+
+ # pdf preview
+ pref_auto_add_doc_tags_in_preview = self.ui.get_widget('pref_auto_add_doc_tags_in_preview')
+ pref_auto_add_doc_tags_in_preview.set_active(
self.config.get_bool( 'pref_auto_add_doc_tags_in_preview') )
+ pref_auto_add_doc_tags_in_preview.connect('toggled', lambda x:
self.config.set_bool( 'pref_auto_add_doc_tags_in_preview',
pref_auto_add_doc_tags_in_preview.get_active()) )
+ pref_keep_preview_on_parent = self.ui.get_widget('pref_keep_preview_on_parent')
+ pref_keep_preview_on_parent.set_active(
self.config.get_bool( 'pref_keep_preview_on_parent') )
+ pref_keep_preview_on_parent.connect('toggled', lambda x:
self.config.set_bool( 'pref_keep_preview_on_parent',
pref_keep_preview_on_parent.get_active()) )
+ pref_default_doc_class = self.ui.get_widget('pref_default_doc_class')
+ pref_default_doc_class.set_text(
self.config.get_string( 'default_doc_class', default='article' ) )
+ pref_default_doc_class.connect('changed', lambda x:
self.config.set_string( 'default_doc_class',
pref_default_doc_class.get_text()) )
+
self.ui.get_widget('reset_pref_default_doc_class').connect( 'clicked',
lambda x:
self.ui.get_widget('pref_default_doc_class').set_text( 'article' ) )

def save_default_blank_document(self, buffer):
default_blank_document = buffer.get_text(
buffer.get_start_iter(), buffer.get_end_iter() )

Reply all
Reply to author
Forward
0 new messages