Piggy 0.4.2.4 → 0.4.3.0

data/lib/piggy-gui/pipe_log.rb

@@ -13,54 +13,54 @@ class PipeLog < Fox::FXText
   
   def initialize(parent)
     super(parent)
-    @inputTypes = INPUT_READ|INPUT_EXCEPT
+    @input_types = INPUT_READ|INPUT_EXCEPT
     @pipes = Array.new
   end
   
-  def runCommand(commandline, workingDir, spawn = false)
-    inPath(workingDir) {
-      runCommandAndDisplayOutput(commandline, spawn)
+  def run_command(commandline, working_dir, spawn = false)
+    in_path(working_dir) {
+      run_command_and_display_output(commandline, spawn)
     }
   end
 
-  def hasOpenPipes?
+  def has_open_pipes?
     !@pipes.empty?
   end
   
   # This should be used explicitly before destruction
-  def closePipes
-    @pipes.each { |p| getApp().removeInput(p, @inputTypes) }
+  def close_pipes
+    @pipes.each { |p| getApp().removeInput(p, @input_types) }
     @pipes = Array.new
   end
   
   private
   
-  def closePipe(aPipe)
-    return if !aPipe
-    getApp().removeInput(aPipe, @inputTypes)
-    @pipes.delete(aPipe)
+  def close_pipe(pipe)
+    return if !pipe
+    getApp().removeInput(pipe, @input_types)
+    @pipes.delete(pipe)
   end
   
-  def runCommandAndDisplayOutput(commandline, spawn)
+  def run_command_and_display_output(commandline, spawn)
     unless spawn && UsePipes
       system(commandline) 
       msg = "#{$? != 0 ? 'Error' : 'Success'}: #{commandline}\n"
       appendText(msg)
       return
     end
-    newPipe = IO.popen("#{commandline} 2>&1")
+    new_pipe = IO.popen("#{commandline} 2>&1")
     return if(spawn)
-    getApp().addInput(newPipe, @inputTypes) { |sender, sel, ptr|
+    getApp().addInput(new_pipe, @input_types) { |sender, sel, ptr|
       case FXSELTYPE(sel)
       when SEL_IO_READ
-        text = newPipe.read
+        text = new_pipe.read
         if text
           appendText(text)
         else
-          closePipe(newPipe)
+          close_pipe(new_pipe)
         end
       when SEL_IO_EXCEPT
-        closePipe(newPipe)
+        close_pipe(new_pipe)
       end
     }
   end

data/lib/piggy-gui/progress_with_dialog.rb

@@ -6,12 +6,12 @@ class ProgressWithDialog < Progress
   def initialize(client)
     super()
     @client = client
-    newDialog
+    new_dialog
   end
   
-  def newDialog
+  def new_dialog
     @progressDialog = Fox::FXProgressDialog.new(@client, @task, @task)
-    @progressDialog.setMessage(ruby2Fox(@task))
+    @progressDialog.setMessage(ruby_2_fox(@task))
     @progressDialog.setProgress(@units)
     @progressDialog.setTotal(@numUnits)
     @progressDialog.create
@@ -19,13 +19,13 @@ class ProgressWithDialog < Progress
     @progressDialog.repaint
   end
   
-  def logTask
+  def log_task
     @client.repaint
     if(@progressDialog.isCancelled)
       cancel
     else
-      @progressDialog.setTitle(ruby2Fox(@task))
-      @progressDialog.setMessage(ruby2Fox(@task))
+      @progressDialog.setTitle(ruby_2_fox(@task))
+      @progressDialog.setMessage(ruby_2_fox(@task))
       @progressDialog.setProgress(@units)
       @progressDialog.setTotal(@numUnits)
       @progressDialog.repaint
@@ -33,12 +33,12 @@ class ProgressWithDialog < Progress
     super
   end
   
-  def logProgress(message, unit)
+  def log_progress(message, unit)
     @client.repaint
     if @progressDialog.isCancelled
       cancel
     else
-      @progressDialog.setMessage(ruby2Fox(message))
+      @progressDialog.setMessage(ruby_2_fox(message))
       @progressDialog.setProgress(@units)
       @progressDialog.repaint
     end

data/lib/piggy-gui/require-fox.rb

@@ -10,7 +10,7 @@
 require 'rubygems'
 require 'piggy-core/encoding'
 
-def loadFox
+def load_fox
   begin
     ['fox16', 'fox14', 'fox12', 'fox'].each { |v|
       begin   
@@ -24,9 +24,10 @@ def loadFox
   end
 end
 
-FOXLIB = loadFox
+FOXLIB = load_fox
 
 puts "Using FXRuby library #{FOXLIB}"
+require "#{FOXLIB}/colors"
 
 FOXVERSION_GE_1_2 = (FOXLIB != 'fox')
 
@@ -42,7 +43,7 @@ if FOXVERSION_GE_1_2
   
   PIGGY_WINDOW_PLACEMENT = Fox::PLACEMENT_SCREEN
 
-  def newCombobox(p1, p2, p3, p4, p5, p6)
+  def new_combobox(p1, p2, p3, p4, p5, p6)
     box = Fox::FXComboBox.new(p1, p2, p4, p5, p6)
     box.setNumVisible(p3)
     box
@@ -59,7 +60,7 @@ else
   
   PIGGY_WINDOW_PLACEMENT = Fox::PLACEMENT_DEFAULT
 
-  def newCombobox(p1, p2, p3, p4, p5, p6)
+  def new_combobox(p1, p2, p3, p4, p5, p6)
     Fox::FXComboBox.new(p1, p2, p3, p4, p5, p6)
   end
   def FXSELTYPE(sel)
@@ -68,20 +69,34 @@ else
 end
 
 if ['fox14', 'fox12', 'fox'].include? FOXLIB
-  def fox2Ruby(string)
+  def fox_2_ruby(string)
     string
   end
   
-  def ruby2Fox(string)
+  def ruby_2_fox(string)
     string
   end
 else
-  def fox2Ruby(string)
+  def fox_2_ruby(string)
     utf8_as_string(string)
   end
   
-  def ruby2Fox(string)
+  def ruby_2_fox(string)
     string_as_utf8(string)
   end
 end  
 
+def remove_padding(frame)
+  frame.padLeft=0
+  frame.padRight=0
+  frame.padTop=0
+  frame.padBottom=0
+  return frame
+end
+
+def new_hframe_without_padding(parent)
+  f = Fox::FXHorizontalFrame.new(parent)
+  f.setFrameStyle(Fox::FRAME_NONE)
+  remove_padding(f)
+  return f
+end

data/lib/piggy.rb

@@ -6,7 +6,7 @@
 
 require 'piggy-gui/piggy_image_browser'
 
-def runPiggy
+def run_piggy
   # Make application
   application = Fox::FXApp.new("Piggy", "Sascha D�rdelmann")
   
@@ -14,22 +14,24 @@ def runPiggy
   window = PiggyImageBrowser.new(application)
   
   # Handle interrupts to terminate program gracefully
-  application.addSignal("SIGINT", window.method(:onTerminate))
+  application.addSignal("SIGINT", window.method(:on_terminate))
   
   # Create it
   application.create
   window.show
   
   # Passed image file or directory?
-  arg = ARGV.length > 0 ? ARGV[0] : window.defaultStartupDirectory
-  window.openFileOrLink(arg)
+  arg = ARGV.length > 0 ? ARGV[0] : window.default_startup_directory
+  window.open_file_or_link(arg)
   
   # Run
   application.run
 end
 
+alias :runPiggy :run_piggy
+
 if $0 == __FILE__
-  runPiggy
+  run_piggy
 end
 
 

data/lib/templates/styles/basic/style.css

@@ -1,27 +1,29 @@
-body.thumbs {
-  text-align: center;
+body {
+    text-align: center;
 }
 
-dl {
-  max-width: 600px;
+dl, table.table {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 600px;
 }
 
 /* no max-width in IE < 7 */
 * html dl {
-  width: 600px;
+    width: 600px;
 }
 
 dd {
-  margin:0;
-  padding: 0;
-  width: 110px;
-  height: 114px;
-  float: left;
-  vertical-align: top;
-  text-align: center;
+    margin:0;
+    padding: 0;
+    width: 110px;
+    height: 116px;
+    float: left;
+    vertical-align: top;
+    text-align: center;
 }
 
 td {
-  vertical-align: top;
-  test-align: center;
+    vertical-align: top;
+    text-align: center;
 }

data/lib/templates/styles/black/style.css

@@ -1,64 +1,63 @@
 body {
-  color: #FFFFFF;
-  background:black;
-}
-
-body.thumbs {
-  text-align: center;
+    color: #FFFFFF;
+    background:black;
+    text-align: center;
 }
 
 a:link {
-  color: #FFFF00;
-  text-decoration: underline;
+    color: #FFFF00;
+    text-decoration: underline;
 }
 
 a:visited {
-  color: #FFFF00;
-  text-decoration: underline;
+    color: #FFFF00;
+    text-decoration: underline;
 }
 
 a:hover {
-  color: #AAAAAA;
-  text-decoration: underline;
+    color: #AAAAAA;
+    text-decoration: underline;
 }
 
 a:active {
-  color: #FFFF00;
-  text-decoration: none;
+    color: #FFFF00;
+    text-decoration: none;
 }
 
-dl {
-  max-width: 600px;
+dl, table.table {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 600px;
 }
 
 /* no max-width in IE < 7 */
 * html dl {
-  width: 600px;
+    width: 600px;
 }
 
 dd {
-  margin:0;
-  padding: 0;
-  width: 110px;
-  height: 114px;
-  float: left;
-  vertical-align: top;
-  text-align: center;
+    margin:0;
+    padding: 0;
+    width: 110px;
+    height: 114px;
+    float: left;
+    vertical-align: top;
+    text-align: center;
 }
 
 img {
-  border-style: none
+    border-style: none
 }
 
 div {
-  margin:0;
+    margin:0;
 }
 
 .thumb {
-  margin:0;
+    margin:0;
 }
 
 .thumb p {
-  margin:0;
-  padding:0;
+    margin:0;
+    padding:0;
 }

data/lib/templates/styles/roundedbox/style.css

@@ -1,70 +1,67 @@
 body {
-	background-color:#F1EDCF;
-}
-
-body.thumbs {
-  text-align: center;
+    background-color:#F1EDCF;
+    text-align: center;
 }
 
 h1,h2,h3 {
-	color:#667553;
+    color:#667553;
 }
 
-dl {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 600px;
+dl, table.table {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 600px;
 }
 
 /* no max-width in IE < 7 */
 * html dl {
-  width: 600px;
+    width: 600px;
 }
 
 dd {
-  margin:0;
-  padding: 0;
-  width: 130px;
-  height: 130px;
-  float: left;
-  vertical-align: top;
-  text-align: center;
+    margin:0;
+    padding: 0;
+    width: 130px;
+    height: 130px;
+    float: left;
+    vertical-align: top;
+    text-align: center;
 }
 
 div {
-	margin:0;
+    margin:0;
 }
 
 .preview {
-  background:url(roundedbox_ro.gif) top right no-repeat;
+    background:url(roundedbox_ro.gif) top right no-repeat;
 }
 
 .thumb {
-	margin:0;
-	background:url(roundedbox_lo.gif) top left no-repeat;         
+    margin:0;
+    background:url(roundedbox_lo.gif) top left no-repeat;
 }
 
 .thumb p {
-	margin:0;
-	padding:0;
-	background:url(roundedbox_ru.gif) bottom right no-repeat;
+    margin:0;
+    padding:0;
+    background:url(roundedbox_ru.gif) bottom right no-repeat;
 }
 
 .thumb p a {
-	display: block;
-	background:url(roundedbox_lu.gif) bottom left no-repeat;
-	padding: 6px 20px 20px 6px;
+    display: block;
+    background:url(roundedbox_lu.gif) bottom left no-repeat;
+    padding: 6px 20px 20px 6px;
 }
 
 img {
-  border:none;
+    border:none;
 }
 
 .image_page img {
-  max-width: 100%;
+    max-width: 100%;
 }
 
 /* IE 6 image height */
 * html .thumb p a {
-  padding-bottom: 16px;
+    padding-bottom: 16px;
 }

data/lib/templates/styles/shadow/style.css

@@ -1,63 +1,63 @@
-body.thumbs {
-  text-align: center;
+body {
+    text-align: center;
 }
 
 div {
-  margin:0;
+    margin:0;
 }
 
-dl {
-  margin-left: auto;
-  margin-right: auto;
-  max-width: 600px;
+dl, table.table {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 600px;
 }
 
 /* no max-width in IE < 7 */
 * html dl {
-  width: 600px;
+    width: 600px;
 }
 
 dd {
-  margin:0;
-  padding: 0;
-  width: 110px;
-  height: 114px;
-  float: left;
-  vertical-align: top;
-  text-align: center;
+    margin:0;
+    padding: 0;
+    width: 110px;
+    height: 114px;
+    float: left;
+    vertical-align: top;
+    text-align: center;
 }
 
 .preview {
-  background:url(ro.gif) top right no-repeat;
+    background:url(ro.gif) top right no-repeat;
 }
 
 .thumb {
-  background:url(lo.gif) top left no-repeat;
+    background:url(lo.gif) top left no-repeat;
 }
 
 .thumb p {
-  margin:0;
-  padding:0;
-  background:url(ru.gif) bottom right no-repeat;
+    margin:0;
+    padding:0;
+    background:url(ru.gif) bottom right no-repeat;
 }
 
 .thumb p a {
-  display: block;
-  background: url(lu.gif) bottom left no-repeat;
-  padding: 0px 9px 9px 0px;
+    display: block;
+    background: url(lu.gif) bottom left no-repeat;
+    padding: 0px 9px 9px 0px;
 }
 
 .thumb p a img {
-  border:none;
+    border:none;
 }
 
 .image_page img {
-  max-width: 100%;
+    max-width: 100%;
 }
 
 /* IE 6 image height */
 * html .thumb p a {
-  padding-bottom: 5px;
+    padding-bottom: 5px;
 }
 
 

data/lib/templates/styles/shadow_D9F5F3/style.css

@@ -16,7 +16,7 @@ div {
   padding:0;
 }
 
-dl {
+dl, table.table {
   margin-left: auto;
   margin-right: auto;
   max-width: 600px;

data/lib/templates/styles/shadow_black/style.css

@@ -0,0 +1,78 @@
+body {
+    text-align: center;
+    color:white;
+    background: black;
+}
+
+a {
+    color:yellow;
+}
+
+.image_page a {
+    margin: 10px;
+}
+
+.thumbs dl.table {
+    padding-left: 84px;
+}
+
+div {
+    margin:0;
+    padding:0;
+}
+
+dl, table.table {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 600px;
+}
+
+/* no max-width in IE < 7 */
+* html dl {
+    width: 600px;
+}
+
+dd {
+    margin: 0px;
+    padding: 0;
+    width: 128px;
+    height: 128px;
+    float: left;
+    vertical-align: middle;
+    text-align: center;
+}
+
+.preview {
+    background:url(ro.jpg) top right no-repeat;
+}
+
+.thumb {
+    background:url(lo.jpg) top left no-repeat;
+}
+
+.thumb p {
+    margin:0;
+    padding:0;
+    background:url(ru.jpg) bottom right no-repeat;
+}
+
+.thumb p a {
+    display: block;
+    background: url(lu.jpg) bottom left no-repeat;
+    padding: 0px;
+    padding-right: 28px;
+    padding-bottom: 28px;
+}
+
+.thumb p a img {
+    border:none;
+}
+
+.image_page img {
+    max-width: 100%;
+}
+
+/* IE 6 image height */
+* html .thumb p a {
+    padding-bottom: 24px;
+}