[pdfmod] Some code style tweaks
- From: Gabriel Burt <gburt src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pdfmod] Some code style tweaks
- Date: Sat, 19 Sep 2009 22:38:49 +0000 (UTC)
commit 32f4852b3eaa7359453ce1592ad87a779ebd7214
Author: Gabriel Burt <gabriel burt gmail com>
Date: Sat Sep 19 15:35:30 2009 -0700
Some code style tweaks
src/PdfMod/Gui/Actions.cs | 30 +++++++------
src/PdfMod/Gui/CairoCell.cs | 2 -
src/PdfMod/Gui/Client.cs | 37 ++++++++-------
src/PdfMod/Gui/DocumentIconView.cs | 63 ++++++++++++--------------
src/PdfMod/Gui/MetadataEditorBox.cs | 13 ++----
src/PdfMod/Gui/SelectMatchingBox.cs | 7 +--
src/PdfMod/Pdf/Actions/ExportImagesAction.cs | 12 +++---
7 files changed, 77 insertions(+), 87 deletions(-)
---
diff --git a/src/PdfMod/Gui/Actions.cs b/src/PdfMod/Gui/Actions.cs
index 1b54404..b7c3483 100644
--- a/src/PdfMod/Gui/Actions.cs
+++ b/src/PdfMod/Gui/Actions.cs
@@ -51,9 +51,7 @@ namespace PdfMod.Gui
"Remove", "Extract", "RotateRight", "RotateLeft"
};
- public UndoManager UndoManager {
- get { return undo_manager; }
- }
+ public UndoManager UndoManager { get { return undo_manager; } }
public Actions (Client app, ActionManager action_manager) : base (action_manager, "Global")
{
@@ -205,13 +203,15 @@ namespace PdfMod.Gui
void OnOpen (object o, EventArgs args)
{
- var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open);
+ var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open) {
+ SelectMultiple = true,
+ DefaultResponse = ResponseType.Ok
+ };
chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("PDF Documents"), new string [] {"pdf"}));
chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("All Files"), new string [] {"*"}));
- chooser.SelectMultiple = true;
chooser.AddButton (Stock.Cancel, ResponseType.Cancel);
chooser.AddButton (Stock.Open, ResponseType.Ok);
- chooser.DefaultResponse = ResponseType.Ok;
+
if (app.Document != null) {
chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
} else {
@@ -249,14 +249,15 @@ namespace PdfMod.Gui
void OnInsertFrom (object o, EventArgs args)
{
- var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open);
+ var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Select PDF"), app.Window, FileChooserAction.Open) {
+ SelectMultiple = false,
+ DefaultResponse = ResponseType.Ok
+ };
chooser.AddFilter (GtkUtilities.GetFileFilter ("PDF Documents", new string [] {"pdf"}));
chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("All Files"), new string [] {"*"}));
- chooser.SelectMultiple = false;
chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
chooser.AddButton (Stock.Cancel, ResponseType.Cancel);
chooser.AddButton (Stock.Open, ResponseType.Ok);
- chooser.DefaultResponse = ResponseType.Ok;
var response = chooser.Run ();
string filename = chooser.Filename;
@@ -275,16 +276,17 @@ namespace PdfMod.Gui
void OnSaveAs (object o, EventArgs args)
{
- var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Save as..."), app.Window, FileChooserAction.Save);
- chooser.SelectMultiple = false;
- chooser.DoOverwriteConfirmation = true;
+ var chooser = new Gtk.FileChooserDialog (Catalog.GetString ("Save as..."), app.Window, FileChooserAction.Save) {
+ SelectMultiple = false,
+ DoOverwriteConfirmation = true,
+ CurrentName = System.IO.Path.GetFileName (app.Document.SuggestedSavePath),
+ DefaultResponse = ResponseType.Ok
+ };
chooser.AddButton (Stock.Cancel, ResponseType.Cancel);
chooser.AddButton (Stock.SaveAs, ResponseType.Ok);
chooser.AddFilter (GtkUtilities.GetFileFilter ("PDF Documents", new string [] {"pdf"}));
chooser.AddFilter (GtkUtilities.GetFileFilter (Catalog.GetString ("All Files"), new string [] {"*"}));
chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
- chooser.CurrentName = System.IO.Path.GetFileName (app.Document.SuggestedSavePath);
- chooser.DefaultResponse = ResponseType.Ok;
var response = chooser.Run ();
string filename = chooser.Filename;
diff --git a/src/PdfMod/Gui/CairoCell.cs b/src/PdfMod/Gui/CairoCell.cs
index ee8f993..946696d 100644
--- a/src/PdfMod/Gui/CairoCell.cs
+++ b/src/PdfMod/Gui/CairoCell.cs
@@ -46,7 +46,6 @@ namespace PdfMod.Gui
cr.Rectangle (cell_area.X, cell_area.Y, cell_area.Width, cell_area.Height);
cr.Clip ();
cr.Translate (cell_area.X, cell_area.Y);
- //cr.Save ();
if (state == CellRendererState.Selected) {
Theme.DrawRowSelection (cr, 0, 0, cell_area.Width, cell_area.Height, true);
@@ -61,7 +60,6 @@ namespace PdfMod.Gui
Render (cr, width, height, state);
- //cr.Restore ();
Hyena.Gui.CairoExtensions.DisposeContext (cr);
}
diff --git a/src/PdfMod/Gui/Client.cs b/src/PdfMod/Gui/Client.cs
index 9e90280..e165daf 100644
--- a/src/PdfMod/Gui/Client.cs
+++ b/src/PdfMod/Gui/Client.cs
@@ -81,8 +81,7 @@ namespace PdfMod.Gui
{
app_count++;
- Window = new Gtk.Window (Gtk.WindowType.Toplevel);
- Window.Title = Catalog.GetString ("PDF Mod");
+ Window = new Gtk.Window (Gtk.WindowType.Toplevel) { Title = Catalog.GetString ("PDF Mod") };
Window.SetSizeRequest (640, 480);
Window.DeleteEvent += delegate (object o, DeleteEventArgs args) {
Quit ();
@@ -91,16 +90,14 @@ namespace PdfMod.Gui
// PDF Icon View
IconView = new DocumentIconView (this);
- var iconview_sw = new Gtk.ScrolledWindow ();
- iconview_sw.Child = IconView;
+ var iconview_sw = new Gtk.ScrolledWindow () { Child = IconView };
query_box = new QueryBox (this) { NoShowAll = true };
query_box.Hide ();
// Status bar
StatusBar = new Gtk.Statusbar () { HasResizeGrip = true };
- status_label = new Label ();
- status_label.Xalign = 0.0f;
+ status_label = new Label () { Xalign = 0.0f };
StatusBar.PackStart (status_label, true, true, 6);
StatusBar.ReorderChild (status_label, 0);
@@ -328,7 +325,11 @@ namespace PdfMod.Gui
public void PasswordProvider (PdfPasswordProviderArgs args)
{
+ // This method is called from some random thread, but we need
+ // to do the dialog on the GUI thread; use the reset_event
+ // to block this thread until the user is done with the dialog.
var reset_event = new System.Threading.ManualResetEvent (false);
+
ThreadAssist.ProxyToMain (delegate {
Log.Debug ("Password requested to open document");
var dialog = new Hyena.Widgets.HigMessageDialog (
@@ -338,8 +339,7 @@ namespace PdfMod.Gui
);
dialog.Image = Gtk.IconTheme.Default.LoadIcon ("dialog-password", 48, 0);
- var password_entry = new Entry ();
- password_entry.Visibility = false;
+ var password_entry = new Entry () { Visibility = false };
password_entry.Show ();
dialog.LabelVBox.PackStart (password_entry, false, false, 12);
@@ -358,6 +358,7 @@ namespace PdfMod.Gui
}
reset_event.Set ();
});
+
reset_event.WaitOne ();
}
@@ -368,16 +369,16 @@ namespace PdfMod.Gui
var entry = args.Entry;
switch (entry.Type) {
- case LogEntryType.Warning:
- mtype = Gtk.MessageType.Warning;
- break;
- case LogEntryType.Information:
- mtype = Gtk.MessageType.Info;
- break;
- case LogEntryType.Error:
- default:
- mtype = Gtk.MessageType.Error;
- break;
+ case LogEntryType.Warning:
+ mtype = Gtk.MessageType.Warning;
+ break;
+ case LogEntryType.Information:
+ mtype = Gtk.MessageType.Info;
+ break;
+ case LogEntryType.Error:
+ default:
+ mtype = Gtk.MessageType.Error;
+ break;
}
Hyena.Widgets.HigMessageDialog dialog = new Hyena.Widgets.HigMessageDialog (
diff --git a/src/PdfMod/Gui/DocumentIconView.cs b/src/PdfMod/Gui/DocumentIconView.cs
index 0573958..a805017 100644
--- a/src/PdfMod/Gui/DocumentIconView.cs
+++ b/src/PdfMod/Gui/DocumentIconView.cs
@@ -30,8 +30,7 @@ using PdfMod.Pdf.Actions;
namespace PdfMod.Gui
{
- public enum PageSelectionMode
- {
+ public enum PageSelectionMode {
None,
Evens,
Odds,
@@ -90,10 +89,11 @@ namespace PdfMod.Gui
SelectionMode = SelectionMode.Multiple;
ColumnSpacing = RowSpacing = Margin;
Model = store = new PageListStore ();
- CanZoomIn = CanZoomOut = true;
Reorderable = false;
Spacing = 0;
+ CanZoomIn = CanZoomOut = true;
+
page_renderer = new PageCell (this);
PackStart (page_renderer, true);
AddAttribute (page_renderer, "page", PageListStore.PageColumn);
@@ -348,20 +348,20 @@ namespace PdfMod.Gui
#region Document event handling
- public void SetDocument (Document document)
+ public void SetDocument (Document new_doc)
{
- if (this.document != null) {
- this.document.PagesAdded -= OnPagesAdded;
- this.document.PagesChanged -= OnPagesChanged;
- this.document.PagesRemoved -= OnPagesRemoved;
- this.document.PagesMoved -= OnPagesMoved;
+ if (document != null) {
+ document.PagesAdded -= OnPagesAdded;
+ document.PagesChanged -= OnPagesChanged;
+ document.PagesRemoved -= OnPagesRemoved;
+ document.PagesMoved -= OnPagesMoved;
}
- this.document = document;
- this.document.PagesAdded += OnPagesAdded;
- this.document.PagesChanged += OnPagesChanged;
- this.document.PagesRemoved += OnPagesRemoved;
- this.document.PagesMoved += OnPagesMoved;
+ document = new_doc;
+ document.PagesAdded += OnPagesAdded;
+ document.PagesChanged += OnPagesChanged;
+ document.PagesRemoved += OnPagesRemoved;
+ document.PagesMoved += OnPagesMoved;
store.SetDocument (document);
page_selection_mode = PageSelectionMode.None;
@@ -381,13 +381,6 @@ namespace PdfMod.Gui
void OnPagesChanged (Page [] pages)
{
- /*foreach (var page in pages) {
- var iter = store.GetIterForPage (page);
- if (!TreeIter.Zero.Equals (iter)) {
- store.EmitRowChanged (store.GetPath (iter), iter);
- }
- }*/
-
Refresh ();
}
@@ -415,6 +408,7 @@ namespace PdfMod.Gui
if (!zoom_manually_set) {
ZoomFit ();
}
+
RefreshSelection ();
}
@@ -524,29 +518,30 @@ namespace PdfMod.Gui
void RefreshSelection ()
{
refreshing_selection = true;
- if (page_selection_mode == PageSelectionMode.None) {
- } else if (page_selection_mode == PageSelectionMode.All) {
+
+ if (page_selection_mode == PageSelectionMode.All) {
SelectAll ();
- } else {
+ } else if (page_selection_mode != PageSelectionMode.None) {
List<Page> matches = null;
if (page_selection_mode == PageSelectionMode.Matching) {
matches = new List<Page> (app.Document.FindPagesMatching (selection_match_query));
}
+
int i = 1;
foreach (var iter in store.TreeIters) {
var path = store.GetPath (iter);
bool select = false;
switch (page_selection_mode) {
- case PageSelectionMode.Evens:
- select = (i % 2) == 0;
- break;
- case PageSelectionMode.Odds:
- select = (i % 2) == 1;
- break;
- case PageSelectionMode.Matching:
- select = matches.Contains (store.GetValue (iter, PageListStore.PageColumn) as Page);
- break;
+ case PageSelectionMode.Evens:
+ select = (i % 2) == 0;
+ break;
+ case PageSelectionMode.Odds:
+ select = (i % 2) == 1;
+ break;
+ case PageSelectionMode.Matching:
+ select = matches.Contains (store.GetValue (iter, PageListStore.PageColumn) as Page);
+ break;
}
if (select) {
@@ -557,8 +552,8 @@ namespace PdfMod.Gui
i++;
}
}
- refreshing_selection = false;
+ refreshing_selection = false;
QueueDraw ();
}
diff --git a/src/PdfMod/Gui/MetadataEditorBox.cs b/src/PdfMod/Gui/MetadataEditorBox.cs
index 1e94832..6b00e05 100644
--- a/src/PdfMod/Gui/MetadataEditorBox.cs
+++ b/src/PdfMod/Gui/MetadataEditorBox.cs
@@ -38,12 +38,11 @@ namespace PdfMod.Gui
this.app = app;
app.DocumentLoaded += HandleDocumentLoaded;
- table = new Table (2, 5, false) {
+ Child = table = new Table (2, 5, false) {
RowSpacing = 6,
ColumnSpacing = 6,
BorderWidth = 6
};
- Child = table;
BuildEditor ();
BuildButtons ();
@@ -83,17 +82,13 @@ namespace PdfMod.Gui
void BuildButtons ()
{
- revert_button = new Hyena.Widgets.ImageButton (Catalog.GetString ("_Revert Properties"), "revert") {
- TooltipText = Catalog.GetString ("Change the document's properties back to the original values")
- };
+ revert_button = new Hyena.Widgets.ImageButton (Catalog.GetString ("_Revert Properties"), "revert");
+ revert_button.TooltipText = Catalog.GetString ("Change the document's properties back to the original values");
revert_button.Clicked += HandleRevert;
-
var close_button = new Hyena.Widgets.ImageButton (Catalog.GetString ("_Close"), Gtk.Stock.Close);
close_button.TooltipText = Catalog.GetString ("Hide the document's properties");
- close_button.Clicked += delegate {
- Hide ();
- };
+ close_button.Clicked += delegate { Hide (); };
table.Attach (revert_button, 4, 5, 0, 1, AttachOptions.Fill, 0, 0, 0);
table.Attach (close_button, 4, 5, 1, 2, AttachOptions.Fill, 0, 0, 0);
diff --git a/src/PdfMod/Gui/SelectMatchingBox.cs b/src/PdfMod/Gui/SelectMatchingBox.cs
index f585557..2217550 100644
--- a/src/PdfMod/Gui/SelectMatchingBox.cs
+++ b/src/PdfMod/Gui/SelectMatchingBox.cs
@@ -32,11 +32,10 @@ namespace PdfMod.Gui
{
this.app = app;
AppPaintable = true;
- hbox = new HBox ();
- hbox.BorderWidth = 6;
- Entry = new Gtk.Entry ();
- Entry.WidthChars = 40;
+ hbox = new HBox () { BorderWidth = 6 };
+
+ Entry = new Gtk.Entry () { WidthChars = 40 };
Entry.Activated += OnActivated;
var query_button = new Hyena.Widgets.ImageButton (Catalog.GetString ("Select Matching"), Gtk.Stock.Find);
diff --git a/src/PdfMod/Pdf/Actions/ExportImagesAction.cs b/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
index 450bee6..2aa5516 100644
--- a/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
+++ b/src/PdfMod/Pdf/Actions/ExportImagesAction.cs
@@ -107,12 +107,12 @@ namespace PdfMod.Pdf.Actions
{
string filter = image.ImageObject.Elements.GetName("/Filter");
switch (filter) {
- case "/DCTDecode":
- ExportJpegImage (image, GetFilename (image, to_path, "jpg"));
- break;
- case "/FlateDecode":
- ExportAsPngImage (image, GetFilename (image, to_path, "png"));
- break;
+ case "/DCTDecode":
+ ExportJpegImage (image, GetFilename (image, to_path, "jpg"));
+ break;
+ case "/FlateDecode":
+ ExportAsPngImage (image, GetFilename (image, to_path, "png"));
+ break;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
