[merge/bzr-gtk] added conflicts to olive menu, some trivial fixes

Sun Feb 4 12:33:43 GMT 2007

Looks good, +1.

Cheers,

Jelmer

On Sun, Feb 04, 2007 at 01:23:30PM +0100, Szilveszter Farkas wrote:
> Sorry, attachment forgotten...

> # Bazaar revision bundle v0.8
> #
> # message:
> #   Some trivial fixes regarding module imports.
> # committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
> # date: Sun 2007-02-04 13:11:31.375999928 +0100

> === modified file dialog.py
> --- dialog.py
> +++ dialog.py
> @@ -26,21 +26,15 @@

>  def about():
>      """ Display the AboutDialog. """
> -    version = None
> -    try:
> -        import bzrlib.plugins.gtk
> -    except ImportError:
> -        version = 'N/A'
> -    else:
> -        version = bzrlib.plugins.gtk.__version__
> -    from guifiles import GLADEFILENAME
> +    from bzrlib.plugins.gtk import __version__
> +    from bzrlib.plugins.gtk.olive.guifiles import GLADEFILENAME

>      # Load AboutDialog description
>      dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
>      dialog = dglade.get_widget('aboutdialog')

>      # Set version
> -    dialog.set_version(version)
> +    dialog.set_version(__version__)

>      dialog.run()
>      # Destroy the dialog

> === modified file olive-gtk
> --- olive-gtk
> +++ olive-gtk
> @@ -82,7 +82,7 @@
>  load_plugins()

>  import bzrlib.ui
> -import ui
> +import bzrlib.plugins.gtk.ui as ui
>  bzrlib.ui.ui_factory = ui.GtkUIFactory()

>  from olive import OliveGtk

> === modified file olive.glade // last-changed:szilveszter.farkas at gmail.com-2007
> ... 0204120545-o7rxnkmhjctvkhnb
> --- olive.glade
> +++ olive.glade
> @@ -341,6 +341,15 @@
>  		      <signal name="activate" handler="on_menuitem_branch_missing_revisions_activate" last_modification_time="Sat, 02 Sep 2006 14:01:29 GMT"/>
>  		    </widget>
>  		  </child>
> +		  
> +		  <child>
> +		    <widget class="GtkMenuItem" id="menuitem_branch_conflicts">
> +		      <property name="visible">True</property>
> +		      <property name="label" translatable="yes">Con_flicts...</property>
> +		      <property name="use_underline">True</property>
> +		      <signal name="activate" handler="on_menuitem_branch_conflicts_activate" last_modification_time="Sun, 04 Feb 2007 12:54:00 GMT"/>
> +		    </widget>
> +		  </child>
>  		</widget>
>  	      </child>
>  	    </widget>

> === modified file olive/__init__.py // last-changed:szilveszter.farkas at gmail.co
> ... m-20070204120545-o7rxnkmhjctvkhnb
> --- olive/__init__.py
> +++ olive/__init__.py
> @@ -44,6 +44,7 @@
>  from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
>  from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
>  from bzrlib.plugins.gtk.commit import CommitDialog
> +from bzrlib.plugins.gtk.conflicts import ConflictsDialog
>  from bzrlib.plugins.gtk.push import PushDialog

>  class OliveGtk:
> @@ -86,6 +87,7 @@
>          self.menuitem_branch_commit = self.toplevel.get_widget('menuitem_branch_commit')
>          self.menuitem_branch_status = self.toplevel.get_widget('menuitem_branch_status')
>          self.menuitem_branch_missing = self.toplevel.get_widget('menuitem_branch_missing_revisions')
> +        self.menuitem_branch_conflicts = self.toplevel.get_widget('menuitem_branch_conflicts')
>          self.menuitem_stats = self.toplevel.get_widget('menuitem_stats')
>          self.menuitem_stats_diff = self.toplevel.get_widget('menuitem_stats_diff')
>          self.menuitem_stats_log = self.toplevel.get_widget('menuitem_stats_log')
> @@ -126,6 +128,7 @@
>                  "on_menuitem_branch_pull_activate": self.on_menuitem_branch_pull_activate,
>                  "on_menuitem_branch_status_activate": self.on_menuitem_branch_status_activate,
>                  "on_menuitem_branch_missing_revisions_activate": self.on_menuitem_branch_missing_revisions_activate,
> +                "on_menuitem_branch_conflicts_activate": self.on_menuitem_branch_conflicts_activate,
>                  "on_menuitem_stats_diff_activate": self.on_menuitem_stats_diff_activate,
>                  "on_menuitem_stats_log_activate": self.on_menuitem_stats_log_activate,
>                  "on_menuitem_stats_infos_activate": self.on_menuitem_stats_infos_activate,
> @@ -244,6 +247,13 @@

>              commit.destroy()

> +    def on_menuitem_branch_conflicts_activate(self, widget):
> +        """ Branch/Conflicts... menu handler. """
> +        conflicts = ConflictsDialog(self.wt, self.window)
> +        response = conflicts.run()
> +        if response != gtk.RESPONSE_NONE:
> +            conflicts.destroy()
> +    
>      def on_menuitem_branch_merge_activate(self, widget):
>          """ Branch/Merge... menu handler. """
>          from bzrlib.plugins.gtk.merge import MergeDialog
> @@ -725,6 +735,7 @@
>          self.menuitem_branch_commit.set_sensitive(not self.notbranch)
>          self.menuitem_branch_status.set_sensitive(not self.notbranch)
>          self.menuitem_branch_missing.set_sensitive(not self.notbranch)
> +        self.menuitem_branch_conflicts.set_sensitive(not self.notbranch)
>          self.menuitem_stats.set_sensitive(not self.notbranch)
>          self.menuitem_add_files.set_sensitive(not self.notbranch)
>          self.menuitem_remove_files.set_sensitive(not self.notbranch)

> === modified directory  // last-changed:szilveszter.farkas at gmail.com-2007020412
> ... 1131-fikodh5efn2jgi81
> # revision id: szilveszter.farkas at gmail.com-20070204121131-fikodh5efn2jgi81
> # sha1: 46074c262982c798f705a0af39fa3a52c9357324
> # inventory sha1: 0dfd5de6917f7639c72e8180f048c0361ab77b2f
> # parent ids:
> #   szilveszter.farkas at gmail.com-20070204120545-o7rxnkmhjctvkhnb
> # base id: szilveszter.farkas at gmail.com-20070203175400-52qxvu3qec9u11cw
> # properties:
> #   branch-nick: bzr-gtk

> # message:
> #   Added Conflicts entry to the Branch menu.
> # committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
> # date: Sun 2007-02-04 13:05:45.108000040 +0100

> === modified file olive.glade // encoding:base64
> LS0tIG9saXZlLmdsYWRlCisrKyBvbGl2ZS5nbGFkZQpAQCAtMzQxLDYgKzM0MSwxNSBAQAogCQkg
> ICAgICA8c2lnbmFsIG5hbWU9ImFjdGl2YXRlIiBoYW5kbGVyPSJvbl9tZW51aXRlbV9icmFuY2hf
> bWlzc2luZ19yZXZpc2lvbnNfYWN0aXZhdGUiIGxhc3RfbW9kaWZpY2F0aW9uX3RpbWU9IlNhdCwg
> MDIgU2VwIDIwMDYgMTQ6MDE6MjkgR01UIi8+CiAJCSAgICA8L3dpZGdldD4KIAkJICA8L2NoaWxk
> PgorCQkgIAorCQkgIDxjaGlsZD4KKwkJICAgIDx3aWRnZXQgY2xhc3M9Ikd0a01lbnVJdGVtIiBp
> ZD0ibWVudWl0ZW1fYnJhbmNoX2NvbmZsaWN0cyI+CisJCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ2
> aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KKwkJICAgICAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0
> cmFuc2xhdGFibGU9InllcyI+Q29uX2ZsaWN0cy4uLjwvcHJvcGVydHk+CisJCSAgICAgIDxwcm9w
> ZXJ0eSBuYW1lPSJ1c2VfdW5kZXJsaW5lIj5UcnVlPC9wcm9wZXJ0eT4KKwkJICAgICAgPHNpZ25h
> bCBuYW1lPSJhY3RpdmF0ZSIgaGFuZGxlcj0ib25fbWVudWl0ZW1fYnJhbmNoX2NvbmZsaWN0c19h
> Y3RpdmF0ZSIgbGFzdF9tb2RpZmljYXRpb25fdGltZT0iU3VuLCAwNCBGZWIgMjAwNyAxMjo1NDow
> MCBHTVQiLz4KKwkJICAgIDwvd2lkZ2V0PgorCQkgIDwvY2hpbGQ+CiAJCTwvd2lkZ2V0PgogCSAg
> ICAgIDwvY2hpbGQ+CiAJICAgIDwvd2lkZ2V0PgoK

> === modified file olive/__init__.py // encoding:base64
> LS0tIG9saXZlL19faW5pdF9fLnB5CisrKyBvbGl2ZS9fX2luaXRfXy5weQpAQCAtNDQsNiArNDQs
> NyBAQAogZnJvbSBienJsaWIucGx1Z2lucy5ndGsuYW5ub3RhdGUuZ2Fubm90YXRlIGltcG9ydCBH
> QW5ub3RhdGVXaW5kb3cKIGZyb20gYnpybGliLnBsdWdpbnMuZ3RrLmFubm90YXRlLmNvbmZpZyBp
> bXBvcnQgR0Fubm90YXRlQ29uZmlnCiBmcm9tIGJ6cmxpYi5wbHVnaW5zLmd0ay5jb21taXQgaW1w
> b3J0IENvbW1pdERpYWxvZworZnJvbSBienJsaWIucGx1Z2lucy5ndGsuY29uZmxpY3RzIGltcG9y
> dCBDb25mbGljdHNEaWFsb2cKIGZyb20gYnpybGliLnBsdWdpbnMuZ3RrLnB1c2ggaW1wb3J0IFB1
> c2hEaWFsb2cKIAogY2xhc3MgT2xpdmVHdGs6CkBAIC04Niw2ICs4Nyw3IEBACiAgICAgICAgIHNl
> bGYubWVudWl0ZW1fYnJhbmNoX2NvbW1pdCA9IHNlbGYudG9wbGV2ZWwuZ2V0X3dpZGdldCgnbWVu
> dWl0ZW1fYnJhbmNoX2NvbW1pdCcpCiAgICAgICAgIHNlbGYubWVudWl0ZW1fYnJhbmNoX3N0YXR1
> cyA9IHNlbGYudG9wbGV2ZWwuZ2V0X3dpZGdldCgnbWVudWl0ZW1fYnJhbmNoX3N0YXR1cycpCiAg
> ICAgICAgIHNlbGYubWVudWl0ZW1fYnJhbmNoX21pc3NpbmcgPSBzZWxmLnRvcGxldmVsLmdldF93
> aWRnZXQoJ21lbnVpdGVtX2JyYW5jaF9taXNzaW5nX3JldmlzaW9ucycpCisgICAgICAgIHNlbGYu
> bWVudWl0ZW1fYnJhbmNoX2NvbmZsaWN0cyA9IHNlbGYudG9wbGV2ZWwuZ2V0X3dpZGdldCgnbWVu
> dWl0ZW1fYnJhbmNoX2NvbmZsaWN0cycpCiAgICAgICAgIHNlbGYubWVudWl0ZW1fc3RhdHMgPSBz
> ZWxmLnRvcGxldmVsLmdldF93aWRnZXQoJ21lbnVpdGVtX3N0YXRzJykKICAgICAgICAgc2VsZi5t
> ZW51aXRlbV9zdGF0c19kaWZmID0gc2VsZi50b3BsZXZlbC5nZXRfd2lkZ2V0KCdtZW51aXRlbV9z
> dGF0c19kaWZmJykKICAgICAgICAgc2VsZi5tZW51aXRlbV9zdGF0c19sb2cgPSBzZWxmLnRvcGxl
> dmVsLmdldF93aWRnZXQoJ21lbnVpdGVtX3N0YXRzX2xvZycpCkBAIC0xMjYsNiArMTI4LDcgQEAK
> ICAgICAgICAgICAgICAgICAib25fbWVudWl0ZW1fYnJhbmNoX3B1bGxfYWN0aXZhdGUiOiBzZWxm
> Lm9uX21lbnVpdGVtX2JyYW5jaF9wdWxsX2FjdGl2YXRlLAogICAgICAgICAgICAgICAgICJvbl9t
> ZW51aXRlbV9icmFuY2hfc3RhdHVzX2FjdGl2YXRlIjogc2VsZi5vbl9tZW51aXRlbV9icmFuY2hf
> c3RhdHVzX2FjdGl2YXRlLAogICAgICAgICAgICAgICAgICJvbl9tZW51aXRlbV9icmFuY2hfbWlz
> c2luZ19yZXZpc2lvbnNfYWN0aXZhdGUiOiBzZWxmLm9uX21lbnVpdGVtX2JyYW5jaF9taXNzaW5n
> X3JldmlzaW9uc19hY3RpdmF0ZSwKKyAgICAgICAgICAgICAgICAib25fbWVudWl0ZW1fYnJhbmNo
> X2NvbmZsaWN0c19hY3RpdmF0ZSI6IHNlbGYub25fbWVudWl0ZW1fYnJhbmNoX2NvbmZsaWN0c19h
> Y3RpdmF0ZSwKICAgICAgICAgICAgICAgICAib25fbWVudWl0ZW1fc3RhdHNfZGlmZl9hY3RpdmF0
> ZSI6IHNlbGYub25fbWVudWl0ZW1fc3RhdHNfZGlmZl9hY3RpdmF0ZSwKICAgICAgICAgICAgICAg
> ICAib25fbWVudWl0ZW1fc3RhdHNfbG9nX2FjdGl2YXRlIjogc2VsZi5vbl9tZW51aXRlbV9zdGF0
> c19sb2dfYWN0aXZhdGUsCiAgICAgICAgICAgICAgICAgIm9uX21lbnVpdGVtX3N0YXRzX2luZm9z
> X2FjdGl2YXRlIjogc2VsZi5vbl9tZW51aXRlbV9zdGF0c19pbmZvc19hY3RpdmF0ZSwKQEAgLTI0
> NCw2ICsyNDcsMTMgQEAKICAgICAgICAgICAgIAogICAgICAgICAgICAgY29tbWl0LmRlc3Ryb3ko
> KQogICAgIAorICAgIGRlZiBvbl9tZW51aXRlbV9icmFuY2hfY29uZmxpY3RzX2FjdGl2YXRlKHNl
> bGYsIHdpZGdldCk6CisgICAgICAgICIiIiBCcmFuY2gvQ29uZmxpY3RzLi4uIG1lbnUgaGFuZGxl
> ci4gIiIiCisgICAgICAgIGNvbmZsaWN0cyA9IENvbmZsaWN0c0RpYWxvZyhzZWxmLnd0LCBzZWxm
> LndpbmRvdykKKyAgICAgICAgcmVzcG9uc2UgPSBjb25mbGljdHMucnVuKCkKKyAgICAgICAgaWYg
> cmVzcG9uc2UgIT0gZ3RrLlJFU1BPTlNFX05PTkU6CisgICAgICAgICAgICBjb25mbGljdHMuZGVz
> dHJveSgpCisgICAgCiAgICAgZGVmIG9uX21lbnVpdGVtX2JyYW5jaF9tZXJnZV9hY3RpdmF0ZShz
> ZWxmLCB3aWRnZXQpOgogICAgICAgICAiIiIgQnJhbmNoL01lcmdlLi4uIG1lbnUgaGFuZGxlci4g
> IiIiCiAgICAgICAgIGZyb20gYnpybGliLnBsdWdpbnMuZ3RrLm1lcmdlIGltcG9ydCBNZXJnZURp
> YWxvZwpAQCAtNzI1LDYgKzczNSw3IEBACiAgICAgICAgIHNlbGYubWVudWl0ZW1fYnJhbmNoX2Nv
> bW1pdC5zZXRfc2Vuc2l0aXZlKG5vdCBzZWxmLm5vdGJyYW5jaCkKICAgICAgICAgc2VsZi5tZW51
> aXRlbV9icmFuY2hfc3RhdHVzLnNldF9zZW5zaXRpdmUobm90IHNlbGYubm90YnJhbmNoKQogICAg
> ICAgICBzZWxmLm1lbnVpdGVtX2JyYW5jaF9taXNzaW5nLnNldF9zZW5zaXRpdmUobm90IHNlbGYu
> bm90YnJhbmNoKQorICAgICAgICBzZWxmLm1lbnVpdGVtX2JyYW5jaF9jb25mbGljdHMuc2V0X3Nl
> bnNpdGl2ZShub3Qgc2VsZi5ub3RicmFuY2gpCiAgICAgICAgIHNlbGYubWVudWl0ZW1fc3RhdHMu
> c2V0X3NlbnNpdGl2ZShub3Qgc2VsZi5ub3RicmFuY2gpCiAgICAgICAgIHNlbGYubWVudWl0ZW1f
> YWRkX2ZpbGVzLnNldF9zZW5zaXRpdmUobm90IHNlbGYubm90YnJhbmNoKQogICAgICAgICBzZWxm
> Lm1lbnVpdGVtX3JlbW92ZV9maWxlcy5zZXRfc2Vuc2l0aXZlKG5vdCBzZWxmLm5vdGJyYW5jaCkK
> Cg==

> === modified directory  // last-changed:szilveszter.farkas at gmail.com-2007020412
> ... 0545-o7rxnkmhjctvkhnb
> # revision id: szilveszter.farkas at gmail.com-20070204120545-o7rxnkmhjctvkhnb
> # sha1: fa09f31abcb6dba70eeb238464d20038c96a10d7
> # inventory sha1: 8c27d46ed20d29d9874e16689693766914b3f622
> # parent ids:
> #   szilveszter.farkas at gmail.com-20070204105357-qm0m9om0xu4hqem9
> # properties:
> #   branch-nick: bzr-gtk

> # message:
> #   Merge from trunk.
> # committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
> # date: Sun 2007-02-04 11:53:57.348000050 +0100

> === modified directory  // last-changed:szilveszter.farkas at gmail.com-2007020410
> ... 5357-qm0m9om0xu4hqem9
> # revision id: szilveszter.farkas at gmail.com-20070204105357-qm0m9om0xu4hqem9
> # sha1: 7f85993cfebf96cbbf4082ea5445814d791c21e1
> # inventory sha1: 55421b61d4c65f0b43984035c3de4823fa60f335
> # parent ids:
> #   szilveszter.farkas at gmail.com-20070203171929-6egi16ulzmkg9g1g
> #   szilveszter.farkas at gmail.com-20070203175400-52qxvu3qec9u11cw
> # properties:
> #   branch-nick: bzr-gtk


-- 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070204/a4aca5c2/attachment.pgp