Changeset 9dc891a8419d7ed0740e8b201de4748863fbbf9a

Timestamp:

11/11/10 11:24:36 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

b44c79e0e4fc87ca92b457910eafb10b81bf1725

Parents:

b5a6e22f617a855e58a6812eea15550c401cc03c

git-committer:

Matias De la Puente <mfpuente.ar@…> (11/11/10 11:24:36)

Message:

Projects: Rename 'extra options' to 'link options'

Files:

• gtkfrontend/builderslist.vala (modified) (3 diffs)
• libi4uccore/builderslist.vala (modified) (1 diff)
• libi4uccore/profilebuilder.vala (modified) (1 diff)
• libi4uccore/projectprofile.vala (modified) (3 diffs)
• libi4uccore/projectspagelogic.vala (modified) (5 diffs)

gtkfrontend/builderslist.vala

@@ -26 +26 @@
         private ItemsCombo _device_types_combo = new ItemsCombo (_("Device type:"));
         private ItemsCombo _devices_combo = new ItemsCombo (_("Device:"));
-        private Entry _extra_options_entry = new Entry ();
+        private Entry _link_options_entry = new Entry ();
         
         public string current_builder { set; get; }
         public string current_device_type { set; get; }
         public string current_device { set; get; }
-        public string current_extra_options { set; get; }
+        public string current_link_options { set; get; }
         
         public BuildersList ()
@@ -40 +40 @@
                 
                 var vbox = new VBox (false, 0);
-                Utils.add_vbox_label (vbox, _("Extra options:"), _extra_options_entry);
+                Utils.add_vbox_label (vbox, _("Link options:"), _link_options_entry);
                 pack_start (vbox, false, false, 4);
                 
@@ -47 +47 @@
                 bind_property ("current-device-type", _device_types_combo, "current-item", BindingFlags.BIDIRECTIONAL);
                 bind_property ("current-device", _devices_combo, "current-item", BindingFlags.BIDIRECTIONAL);
-                bind_property ("current-extra-options", _extra_options_entry, "text", BindingFlags.BIDIRECTIONAL);
+                bind_property ("current-link-options", _link_options_entry, "text", BindingFlags.BIDIRECTIONAL);
         }
 

libi4uccore/builderslist.vala

@@ -25 +25 @@
         public abstract string current_device_type { set; get; }
         public abstract string current_device { set; get; }
-        public abstract string current_extra_options { set; get; }
+        public abstract string current_link_options { set; get; }
         
         public abstract void add_builder (string builder);

libi4uccore/profilebuilder.vala

@@ -120 +120 @@
                 command = command.replace ("%project", _project.name.replace (" ", "_"));
                 command = command.replace ("%profile", _profile.name.replace (" ", "_"));
-                command += " " + _profile.extra_options;
+                command += " " + _profile.link_options;
                 
                 var command_context = new CommandContext ();

libi4uccore/projectprofile.vala

@@ -30 +30 @@
         public string device_type { set; get; default = ""; }
         public string device { set; get; default = ""; }
-        public string extra_options { set; get; default = ""; }
+        public string link_options { set; get; default = ""; }
         public Gee.List<string> files { get { return _files; } }
         
@@ -41 +41 @@
                 _device_type = key_file.get_string (group, "device_type");
                 _device = key_file.get_string (group, "device");
-                if (key_file.has_key (group, "extra_options"))
-                        _extra_options = key_file.get_string (group, "extra_options");
+                if (key_file.has_key (group, "link_options"))
+                        _link_options = key_file.get_string (group, "link_options");
                 
                 var files = key_file.get_string_list (group, "files");
@@ -57 +57 @@
                 key_file.set_string (group, "device_type", _device_type);
                 key_file.set_string (group, "device", _device);
-                key_file.set_string (group, "extra_options", _extra_options);
+                key_file.set_string (group, "link_options", _link_options);
                 key_file.set_string_list (group, "files", _files.to_array ());
         }

libi4uccore/projectspagelogic.vala

@@ -61 +61 @@
                 _view.builders_list.notify["current-device-type"].connect (on_device_type_changed);
                 _view.builders_list.notify["current-device"].connect (on_device_changed);
-                _view.builders_list.notify["current-extra-options"].connect (on_extra_options_changed);
+                _view.builders_list.notify["current-link-options"].connect (on_link_options_changed);
         }
 
@@ -142 +142 @@
                         new_profile.device_type = profile.device_type;
                         new_profile.device = profile.device;
-                        new_profile.extra_options = profile.extra_options;
+                        new_profile.link_options = profile.link_options;
                         new_profile.files.add_all (dialog_view.activated_files);
                         _current_project.profiles[new_profile.name] = new_profile;
@@ -199 +199 @@
                 _view.builders_list.current_device_type = profile.device_type;
                 _view.builders_list.current_device = profile.device;
-                _view.builders_list.current_extra_options = profile.extra_options;
+                _view.builders_list.current_link_options = profile.link_options;
                 
                 _view.builders_list_sensitive = true;
@@ -297 +297 @@
         }
         
-        private void on_extra_options_changed ()
+        private void on_link_options_changed ()
         {
                 if (!_view.builders_list_sensitive)
@@ -305 +305 @@
                         return;
                 
-                var current_extra_options = _view.builders_list.current_extra_options;
-                _current_project.profiles[_current_profile].extra_options = current_extra_options ?? "";
+                var current_link_options = _view.builders_list.current_link_options;
+                _current_project.profiles[_current_profile].link_options = current_link_options ?? "";
                 _current_project.save ();
         }