Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugal-tweak.git;a=commitdiff;h=0087a401cdbeab12d30c0afb659da461b64a4dc5
commit 0087a401cdbeab12d30c0afb659da461b64a4dc5
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun Jan 9 23:16:28 2011 +0100
*added repo to combobox
diff --git a/frugal-tweak-vala/UI/MainUI.ui b/frugal-tweak-vala/UI/MainUI.ui
index 10a75c5..d3dac0f 100644
--- a/frugal-tweak-vala/UI/MainUI.ui
+++ b/frugal-tweak-vala/UI/MainUI.ui
@@ -498,7 +498,7 @@
<object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<child>
- <object class="GtkComboBox" id="combobox1">
+ <object class="GtkComboBox" id="combobox_repo">
<property name="visible">True</property>
</object>
<packing>
diff --git a/frugal-tweak-vala/src/mini-pacman-g2.vala
b/frugal-tweak-vala/src/mini-pacman-g2.vala
index 506e2bd..06f3c72 100644
--- a/frugal-tweak-vala/src/mini-pacman-g2.vala
+++ b/frugal-tweak-vala/src/mini-pacman-g2.vala
@@ -20,16 +20,37 @@
using Gtk;
using Tree;
+pacman mini_pacman;
+
int main (string[] args) {
Gtk.init (ref args);
- var builder = new Builder ();
+ var builder = new Builder ();
builder.add_from_file ("/usr/share/frugalware-tweak/UI/MainUI.ui");
EventGtk event = new EventGtk();
builder.connect_signals (event);
var window = builder.get_object ("window_pacman") as Window;
window.destroy.connect (Gtk.main_quit);
+ mini_pacman = new pacman();
+ ListStore model;
+ CellRenderer cell;
+ string [] repos = mini_pacman.repos();
+ Gtk.ComboBox pacman_repo = builder.get_object("combobox_repo") as
Gtk.ComboBox;
+ model = new ListStore( 2, typeof( string ), typeof( int ) );
+ int i = 0;
+ while(i<=repos.length)
+ {
+ TreeIter iter;
+ model.append( out iter );
+ model.set( iter, 0, repos[i], 1, i );
+ i++;
+ }
+ cell = new CellRendererText();
+ pacman_repo.pack_start( cell, false );
+ pacman_repo.set_attributes( cell, "text", 0 );
+ pacman_repo.model=model;
+
window.show_all ();
Gtk.main ();
diff --git a/frugal-tweak-vala/src/pacman.vala
b/frugal-tweak-vala/src/pacman.vala
index 06a62b7..2fec1d1 100644
--- a/frugal-tweak-vala/src/pacman.vala
+++ b/frugal-tweak-vala/src/pacman.vala
@@ -25,12 +25,12 @@ public class pacman
{
private static const string CFG_FILE
="/etc/pacman-g2.conf";
- private static const string FW_CURRENT
="frugalware-current";
+ private static const string FW_CURRENT
="frugalware-current";
private static const string FW_STABLE ="frugalware";
private static const string FW_LOCAL ="local";
- private static unowned Pacman.PM_DB sync_db = null;
- public static Pacman.PM_LIST *packages = null;
- private static string[] repos
= new string[0];
+ private static unowned Pacman.PM_DB sync_db = null;
+ public static Pacman.PM_LIST *packages = null;
+ private static string[] _repos
= new string[0];
public pacman()
{
@@ -41,8 +41,10 @@ public class pacman
InitDatabase();
}
}
-
-
+ public string [] repos()
+ {
+ return _repos;
+ }
private void InitDatabase()
{
Tools.ConsoleDebug("Parse config pacman-g2");
@@ -50,6 +52,7 @@ public class pacman
Pacman.pacman_cb_db_register callback = _db_callback;
Pacman.pacman_parse_config(CFG_FILE, callback,"");
Pacman.pacman_db_register(FW_LOCAL);
+ _repos += "local";
/* set some important pacman-g2 options */
long _logParam = -1;
Pacman.pacman_set_option (Pacman.Option.LOGCB,_logParam);
@@ -59,22 +62,20 @@ public class pacman
private static void _db_callback (string section, PM_DB db)
{
Tools.ConsoleDebug("Find repo "+section);
- repos += section;
+ _repos += section;
return;
}
-
public void UpdateAllDatabase()
{
Tools.ConsoleDebug("Update all repo");
int i =0;
- while(i <repos.length)
+ while(i <_repos.length)
{
- this.UpdateDatabase(repos[i]);
+ this.UpdateDatabase(_repos[i]);
i++;
}
this.CheckUpdate();
}
-
public void UpdateDatabase(string section)
{
Tools.ConsoleDebug("Update repo "+section);
@@ -88,7 +89,6 @@ public class pacman
}
}
-
public bool CheckUpdate( )
{
bool pkgUpdated = false;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
