jota 0.9.0dev3 → 0.9.0dev4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/clip.rb +2 -2
  2. data/lib/gui.rb +21 -18
  3. data/lib/jota.rb +3 -3
  4. data/lib/version.rb +2 -2
  5. metadata +19 -5
data/lib/clip.rb CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # $Id: clip.rb 257 2010-05-02 19:47:26Z dz $
2
+ # $Id: clip.rb 278 2010-08-08 19:44:10Z dz $
3
3
 
4
4
  require 'time'
5
5
  require 'version'
@@ -159,7 +159,7 @@ end
159
159
 
160
160
  # Return modified title for easier readabiliy
161
161
  def title!
162
- if @title == "" then
162
+ if @title.strip == "" then
163
163
  return "..."
164
164
  else
165
165
  return @title
data/lib/gui.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
- # $Id: gui.rb 276 2010-08-03 12:39:39Z dz $
3
+ # $Id: gui.rb 278 2010-08-08 19:44:10Z dz $
4
4
 
5
5
 
6
6
  # rdoc: see http://en.wikibooks.org/wiki/Ruby_Programming/RubyDoc
@@ -404,10 +404,12 @@ end
404
404
 
405
405
  def on_edit_text_wrap_activate(widget)
406
406
  print_debug "on_edit_text_wrap_activate called"
407
- update
408
- @data.current.wrap = @glade["edit_text_wrap"].active?
409
- show
410
- set_style
407
+
408
+ if @glade["edit_text_wrap"].active? then
409
+ @clip_widget.wrap_mode = Gtk::TextTag::WRAP_WORD
410
+ else
411
+ @clip_widget.wrap_mode = Gtk::TextTag::WRAP_NONE
412
+ end
411
413
  end
412
414
 
413
415
 
@@ -575,9 +577,6 @@ def set_title
575
577
  end
576
578
 
577
579
  def set_buttons
578
- #
579
- # CAUTION: set_buttons may trigger callback functions "on_*"
580
- #
581
580
  if @data.nil? then
582
581
  @glade["but_delete"].sensitive = false
583
582
  @glade["but_new"].sensitive = false
@@ -619,21 +618,24 @@ def set_buttons
619
618
  @glade["menu_close"].sensitive = true
620
619
  @glade["menu_save"].sensitive = true
621
620
  @glade["menu_goto"].sensitive = true
622
-
623
- # Gtk::ToggleButton#active= emits an activate signal
624
- # and thus calls on_edit_text_wrap_activate
625
- if @data.current.wrap then
626
- @clip_widget.wrap_mode = Gtk::TextTag::WRAP_WORD
627
- @glade["edit_text_wrap"].active = true
628
- else
629
- @clip_widget.wrap_mode = Gtk::TextTag::WRAP_NONE
630
- @glade["edit_text_wrap"].active = false
631
- end
632
621
  end
633
622
 
634
623
  @top_window.focus = @glade["clip"]
635
624
  end
636
625
 
626
+ def set_wrap_mode
627
+ return if @data.nil?
628
+
629
+ # Gtk::ToggleButton#active= emits an activate signal
630
+ # and thus calls on_edit_text_wrap_activate
631
+
632
+ if @data.current.wrap then
633
+ @glade["edit_text_wrap"].active = true
634
+ else
635
+ @glade["edit_text_wrap"].active = false
636
+ end
637
+ end
638
+
637
639
  def set_style
638
640
  @clip_widget.modify_text(Gtk::STATE_NORMAL,
639
641
  array_to_color(pref("foreground")))
@@ -811,6 +813,7 @@ end
811
813
  def show
812
814
  clip_to_widget(@clip_widget,@data)
813
815
  set_buttons
816
+ set_wrap_mode
814
817
  set_title
815
818
  end
816
819
 
data/lib/jota.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
- # $Id: jota.rb 276 2010-08-03 12:39:39Z dz $
3
+ # $Id: jota.rb 278 2010-08-08 19:44:10Z dz $
4
4
 
5
5
 
6
6
  require 'getoptlong'
@@ -290,9 +290,9 @@ def run
290
290
  require "jota_curses"
291
291
  rescue LoadError
292
292
  if :gui_ok then
293
- error("Cannot load 'ncurses', try '--gui'")
293
+ error("Cannot load 'Curses', try '--gui'")
294
294
  else
295
- error("Cannot load 'GTK+' nor 'ncurses'")
295
+ error("Cannot load 'GTK+' nor 'Curses'")
296
296
  end
297
297
  end
298
298
  start_curses
data/lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # $Id: version.rb 272 2010-07-31 13:32:37Z dz $
2
+ # $Id: version.rb 278 2010-08-08 19:44:10Z dz $
3
3
 
4
4
 
5
5
  class Version
@@ -29,7 +29,7 @@ MAJOR = 0
29
29
  MINOR = 9
30
30
  PATCH = 0
31
31
  STATE = "dev" # "dev", "beta", "rc", "" (for final)
32
- STATEVER = 3
32
+ STATEVER = 4
33
33
 
34
34
  STRING = "%d.%d.%d%s" % [MAJOR, MINOR,PATCH,Version.state]
35
35
 
metadata CHANGED
@@ -1,7 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jota
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0dev3
4
+ hash: 470221476
5
+ prerelease: true
6
+ segments:
7
+ - 0
8
+ - 9
9
+ - 0dev4
10
+ version: 0.9.0dev4
5
11
  platform: ruby
6
12
  authors:
7
13
  - Derik van Zuetphen
@@ -9,7 +15,7 @@ autorequire:
9
15
  bindir: bin
10
16
  cert_chain: []
11
17
 
12
- date: 2010-08-03 14:39:49 +02:00
18
+ date: 2010-08-09 09:11:00 +02:00
13
19
  default_executable:
14
20
  dependencies: []
15
21
 
@@ -53,21 +59,29 @@ rdoc_options: []
53
59
  require_paths:
54
60
  - lib
55
61
  required_ruby_version: !ruby/object:Gem::Requirement
62
+ none: false
56
63
  requirements:
57
64
  - - ">="
58
65
  - !ruby/object:Gem::Version
66
+ hash: 3
67
+ segments:
68
+ - 0
59
69
  version: "0"
60
- version:
61
70
  required_rubygems_version: !ruby/object:Gem::Requirement
71
+ none: false
62
72
  requirements:
63
73
  - - ">"
64
74
  - !ruby/object:Gem::Version
75
+ hash: 25
76
+ segments:
77
+ - 1
78
+ - 3
79
+ - 1
65
80
  version: 1.3.1
66
- version:
67
81
  requirements: []
68
82
 
69
83
  rubyforge_project: jota
70
- rubygems_version: 1.3.5
84
+ rubygems_version: 1.3.7
71
85
  signing_key:
72
86
  specification_version: 3
73
87
  summary: A simple but powerful jotter in the style of xclipboard