merge with trunk

This commit is contained in:
Peter B. Jørgensen 2010-07-15 16:43:58 +02:00
commit 7d28aba91c
5 changed files with 59 additions and 28 deletions

View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: terminator\n" "Project-Id-Version: terminator\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2010-07-03 22:04+0100\n" "POT-Creation-Date: 2010-07-03 22:04+0100\n"
"PO-Revision-Date: 2010-06-30 07:53+0000\n" "PO-Revision-Date: 2010-07-15 01:15+0000\n"
"Last-Translator: Cecep Mahbub <cecep.mahbub@gmail.com>\n" "Last-Translator: Arief Setiadi Wibowo <q_thrynx@yahoo.com>\n"
"Language-Team: Indonesian <id@li.org>\n" "Language-Team: Indonesian <id@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-05 03:44+0000\n" "X-Launchpad-Export-Date: 2010-07-15 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n" "X-Generator: Launchpad (build Unknown)\n"
#: ../data/terminator.desktop.in.h:1 #: ../data/terminator.desktop.in.h:1
@ -222,11 +222,11 @@ msgstr "Perintah Baru"
#: ../terminatorlib/plugins/custom_commands.py:248 #: ../terminatorlib/plugins/custom_commands.py:248
msgid "Enabled:" msgid "Enabled:"
msgstr "" msgstr "Aktifkan:"
#: ../terminatorlib/plugins/custom_commands.py:254 #: ../terminatorlib/plugins/custom_commands.py:254
msgid "Name:" msgid "Name:"
msgstr "" msgstr "Nama:"
#: ../terminatorlib/plugins/custom_commands.py:260 #: ../terminatorlib/plugins/custom_commands.py:260
msgid "Command:" msgid "Command:"
@ -235,17 +235,17 @@ msgstr "Perintah:"
#: ../terminatorlib/plugins/custom_commands.py:296 #: ../terminatorlib/plugins/custom_commands.py:296
#: ../terminatorlib/plugins/custom_commands.py:406 #: ../terminatorlib/plugins/custom_commands.py:406
msgid "You need to define a name and command" msgid "You need to define a name and command"
msgstr "" msgstr "Anda harus mendefinisikan nama dan perintah"
#: ../terminatorlib/plugins/custom_commands.py:313 #: ../terminatorlib/plugins/custom_commands.py:313
#: ../terminatorlib/plugins/custom_commands.py:425 #: ../terminatorlib/plugins/custom_commands.py:425
#, python-format #, python-format
msgid "Name *%s* already exist" msgid "Name *%s* already exist"
msgstr "" msgstr "Nama *%s* telah digunakan"
#: ../terminatorlib/plugins/terminalshot.py:28 #: ../terminatorlib/plugins/terminalshot.py:28
msgid "Terminal screenshot" msgid "Terminal screenshot"
msgstr "" msgstr "Tangkapan layar Terminal"
#: ../terminatorlib/prefseditor.py:886 ../terminatorlib/prefseditor.py:891 #: ../terminatorlib/prefseditor.py:886 ../terminatorlib/prefseditor.py:891
msgid "New Profile" msgid "New Profile"
@ -280,23 +280,23 @@ msgstr ""
#: ../terminatorlib/searchbar.py:132 ../terminatorlib/searchbar.py:153 #: ../terminatorlib/searchbar.py:132 ../terminatorlib/searchbar.py:153
msgid "No more results" msgid "No more results"
msgstr "" msgstr "Tidak ada lagi hasil"
#: ../terminatorlib/searchbar.py:168 #: ../terminatorlib/searchbar.py:168
msgid "Found at row" msgid "Found at row"
msgstr "" msgstr "Temukan di baris"
#: ../terminatorlib/terminal_popup_menu.py:51 #: ../terminatorlib/terminal_popup_menu.py:51
msgid "_Send email to..." msgid "_Send email to..."
msgstr "" msgstr "Kirim _Surel ke..."
#: ../terminatorlib/terminal_popup_menu.py:52 #: ../terminatorlib/terminal_popup_menu.py:52
msgid "_Copy email address" msgid "_Copy email address"
msgstr "" msgstr "_Copy alamat surel"
#: ../terminatorlib/terminal_popup_menu.py:54 #: ../terminatorlib/terminal_popup_menu.py:54
msgid "Ca_ll VoIP address" msgid "Ca_ll VoIP address"
msgstr "" msgstr "Panggi_l alamat VoIP"
#: ../terminatorlib/terminal_popup_menu.py:55 #: ../terminatorlib/terminal_popup_menu.py:55
msgid "_Copy VoIP address" msgid "_Copy VoIP address"
@ -340,7 +340,7 @@ msgstr ""
#: ../terminatorlib/terminal_popup_menu.py:143 #: ../terminatorlib/terminal_popup_menu.py:143
msgid "Grouping" msgid "Grouping"
msgstr "" msgstr "Pengelompokan"
#: ../terminatorlib/terminal_popup_menu.py:150 #: ../terminatorlib/terminal_popup_menu.py:150
msgid "Show _scrollbar" msgid "Show _scrollbar"
@ -364,11 +364,11 @@ msgstr "Baku"
#: ../terminatorlib/terminal_popup_menu.py:225 #: ../terminatorlib/terminal_popup_menu.py:225
msgid "User defined" msgid "User defined"
msgstr "" msgstr "Ditetapkan pengguna"
#: ../terminatorlib/terminal_popup_menu.py:241 #: ../terminatorlib/terminal_popup_menu.py:241
msgid "Other Encodings" msgid "Other Encodings"
msgstr "" msgstr "Pengkodean Lainnya"
#: ../terminatorlib/terminal.py:365 #: ../terminatorlib/terminal.py:365
msgid "New group..." msgid "New group..."
@ -381,7 +381,7 @@ msgstr "Tidak ada"
#: ../terminatorlib/terminal.py:386 #: ../terminatorlib/terminal.py:386
#, python-format #, python-format
msgid "Remove group %s" msgid "Remove group %s"
msgstr "" msgstr "Hapus grup %s"
#: ../terminatorlib/terminal.py:391 #: ../terminatorlib/terminal.py:391
msgid "G_roup all in tab" msgid "G_roup all in tab"
@ -398,7 +398,7 @@ msgstr "Hapus semua grup"
#: ../terminatorlib/terminal.py:408 #: ../terminatorlib/terminal.py:408
#, python-format #, python-format
msgid "Close group %s" msgid "Close group %s"
msgstr "" msgstr "Tutup grup %s"
#: ../terminatorlib/terminal.py:417 #: ../terminatorlib/terminal.py:417
msgid "Broadcast all" msgid "Broadcast all"
@ -448,4 +448,4 @@ msgstr "Semua"
#: ../terminatorlib/window.py:566 #: ../terminatorlib/window.py:566
#, python-format #, python-format
msgid "Tab %d" msgid "Tab %d"
msgstr "" msgstr "Tab %d"

View File

@ -158,6 +158,7 @@ DEFAULTS = {
'profiles': { 'profiles': {
'default': { 'default': {
'allow_bold' : True, 'allow_bold' : True,
'antialias' : True,
'audible_bell' : False, 'audible_bell' : False,
'visible_bell' : False, 'visible_bell' : False,
'urgent_bell' : False, 'urgent_bell' : False,

View File

@ -1004,6 +1004,19 @@
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkCheckButton" id="antialias_checkbutton">
<property name="label" translatable="yes">Anti-alias text</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_antialias_checkbutton_toggled"/>
</object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child> <child>
<object class="GtkCheckButton" id="show_titlebar"> <object class="GtkCheckButton" id="show_titlebar">
<property name="label" translatable="yes">Show titlebar</property> <property name="label" translatable="yes">Show titlebar</property>
@ -1016,7 +1029,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1029,7 +1042,7 @@
<signal name="toggled" handler="on_copy_on_selection_toggled"/> <signal name="toggled" handler="on_copy_on_selection_toggled"/>
</object> </object>
<packing> <packing>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1065,7 +1078,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1199,7 +1212,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">6</property> <property name="position">7</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -1300,7 +1313,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="position">7</property> <property name="position">8</property>
</packing> </packing>
</child> </child>
</object> </object>

View File

@ -323,6 +323,9 @@ class PrefsEditor:
# Allow bold text # Allow bold text
widget = guiget('allow_bold_checkbutton') widget = guiget('allow_bold_checkbutton')
widget.set_active(self.config['allow_bold']) widget.set_active(self.config['allow_bold'])
# Anti-alias
widget = guiget('antialias_checkbutton')
widget.set_active(self.config['antialias'])
# Icon terminal bell # Icon terminal bell
widget = guiget('icon_bell_checkbutton') widget = guiget('icon_bell_checkbutton')
widget.set_active(self.config['icon_bell']) widget.set_active(self.config['icon_bell'])
@ -577,6 +580,11 @@ class PrefsEditor:
self.config['allow_bold'] = widget.get_active() self.config['allow_bold'] = widget.get_active()
self.config.save() self.config.save()
def on_antialias_checkbutton_toggled(self, widget):
"""Anti-alias setting changed"""
self.config['antialias'] = widget.get_active()
self.config.save()
def on_show_titlebar_toggled(self, widget): def on_show_titlebar_toggled(self, widget):
"""Show titlebar setting changed""" """Show titlebar setting changed"""
self.config['show_titlebar'] = widget.get_active() self.config['show_titlebar'] = widget.get_active()

View File

@ -585,7 +585,7 @@ for %s (%s)' % (name, urlplugin.__class__.__name__))
font = self.config.get_system_font() font = self.config.get_system_font()
else: else:
font = self.config['font'] font = self.config['font']
self.vte.set_font(pango.FontDescription(font)) self.set_font(pango.FontDescription(font))
except: except:
pass pass
self.vte.set_allow_bold(self.config['allow_bold']) self.vte.set_allow_bold(self.config['allow_bold'])
@ -1071,7 +1071,7 @@ for %s (%s)' % (name, urlplugin.__class__.__name__))
return return
new_font.set_size(new_size) new_font.set_size(new_size)
dbg('setting new font: %s' % new_font) dbg('setting new font: %s' % new_font)
self.vte.set_font(new_font) self.set_font(new_font)
def is_zoomed(self): def is_zoomed(self):
"""Determine if we are a zoomed terminal""" """Determine if we are a zoomed terminal"""
@ -1270,7 +1270,7 @@ for %s (%s)' % (name, urlplugin.__class__.__name__))
fontsize += pango.SCALE fontsize += pango.SCALE
pangodesc.set_size(fontsize) pangodesc.set_size(fontsize)
self.vte.set_font(pangodesc) self.set_font(pangodesc)
self.custom_font_size = fontsize self.custom_font_size = fontsize
def zoom_orig(self): def zoom_orig(self):
@ -1280,9 +1280,18 @@ for %s (%s)' % (name, urlplugin.__class__.__name__))
else: else:
font = self.config['font'] font = self.config['font']
dbg("Terminal::zoom_orig: restoring font to: %s" % font) dbg("Terminal::zoom_orig: restoring font to: %s" % font)
self.vte.set_font(pango.FontDescription(font)) self.set_font(pango.FontDescription(font))
self.custom_font_size = None self.custom_font_size = None
def set_font(self, fontdesc):
"""Set the font we want in VTE"""
antialias = self.config['antialias']
if antialias:
antialias = vte.ANTI_ALIAS_FORCE_ENABLE
else:
antialias = vte.ANTI_ALIAS_FORCE_DISABLE
self.vte.set_font_full(fontdesc, antialias)
def get_cursor_position(self): def get_cursor_position(self):
"""Return the co-ordinates of our cursor""" """Return the co-ordinates of our cursor"""
# FIXME: THIS METHOD IS DEPRECATED AND UNUSED # FIXME: THIS METHOD IS DEPRECATED AND UNUSED