From uludag-commits at pardus.org.tr Sat Dec 1 07:58:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Dec 2007 07:58:31 +0200 (EET) Subject: [Uludag-commits] r16206 - trunk/planet/gezegen.pardus.org.tr Message-ID: <20071201055831.60E3D7C0028@liste.uludag.org.tr> Author: cartman Date: Sat Dec 1 07:58:31 2007 New Revision: 16206 Modified: trunk/planet/gezegen.pardus.org.tr/config.ini Log: workaround feedparser bug Modified: trunk/planet/gezegen.pardus.org.tr/config.ini ================================================================= --- trunk/planet/gezegen.pardus.org.tr/config.ini (original) +++ trunk/planet/gezegen.pardus.org.tr/config.ini Sat Dec 1 07:58:31 2007 @@ -120,7 +120,7 @@ name=Eren Türkay face=http://qwzxcv.wordpress.com/avatar/qwzxcv-96.jpg -[http://serkank.wordpress.com/tag/gezegen/feed] +[http://serkank.wordpress.com/category/gezegen/atom] name=Serkan Kaba face=http://cekirdek.pardus.org.tr/~baris/img/serkankmr7.jpg From uludag-commits at pardus.org.tr Sat Dec 1 23:18:22 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 1 Dec 2007 23:18:22 +0200 (EET) Subject: [Uludag-commits] r16207 - trunk/initramfs Message-ID: <20071201211822.4EFF97C002F@liste.uludag.org.tr> Author: onur Date: Sat Dec 1 23:18:22 2007 New Revision: 16207 Modified: trunk/initramfs/mkinitramfs Log: sync with devel Modified: trunk/initramfs/mkinitramfs ================================================================= --- trunk/initramfs/mkinitramfs (original) +++ trunk/initramfs/mkinitramfs Sat Dec 1 23:18:22 2007 @@ -442,7 +442,7 @@ done # Install busybox and init script -cp -a /sbin/busybox $MOUNT_IMAGE/bin/busybox +cp -a /lib/initramfs/busybox $MOUNT_IMAGE/bin/busybox cp -a /lib/initramfs/busybox.links $MOUNT_IMAGE/bin/busybox.links cp -a /usr/bin/disktype $MOUNT_IMAGE/bin/disktype From uludag-commits at pardus.org.tr Mon Dec 3 13:13:51 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 13:13:51 +0200 (EET) Subject: [Uludag-commits] r16208 - trunk/tasma/display-config Message-ID: <20071203111351.AF65E7C002F@liste.uludag.org.tr> Author: fatih Date: Mon Dec 3 13:13:51 2007 New Revision: 16208 Removed: trunk/tasma/display-config/ Log: remove From uludag-commits at pardus.org.tr Mon Dec 3 13:15:16 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 13:15:16 +0200 (EET) Subject: [Uludag-commits] r16209 - in trunk/tasma/display-config: . help help/en po src Message-ID: <20071203111516.EA3B87C002F@liste.uludag.org.tr> Author: fatih Date: Mon Dec 3 13:15:16 2007 New Revision: 16209 Added: trunk/tasma/display-config/ trunk/tasma/display-config/README trunk/tasma/display-config/help/ trunk/tasma/display-config/help/en/ trunk/tasma/display-config/help/en/main_help.html trunk/tasma/display-config/help/help.css trunk/tasma/display-config/po/ trunk/tasma/display-config/setup.py (contents, props changed) trunk/tasma/display-config/src/ trunk/tasma/display-config/src/display-config.desktop trunk/tasma/display-config/src/display-config.py (contents, props changed) trunk/tasma/display-config/src/display_config.png (contents, props changed) trunk/tasma/display-config/src/mainview.py trunk/tasma/display-config/src/parser.py trunk/tasma/display-config/src/utility.py Log: Very simple display configuration tool From uludag-commits at pardus.org.tr Mon Dec 3 14:15:28 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 14:15:28 +0200 (EET) Subject: [Uludag-commits] r16210 - in branches/comar-dbus: include src Message-ID: <20071203121528.EF0967C002F@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Dec 3 14:15:28 2007 New Revision: 16210 Modified: branches/comar-dbus/include/csl.h branches/comar-dbus/include/utility.h branches/comar-dbus/src/csl.c branches/comar-dbus/src/dbus.c branches/comar-dbus/src/main.c branches/comar-dbus/src/utility.c Log: - Check interface and object path existance before forking dbus call - Validate argument tuple - Show execution time Modified: branches/comar-dbus/include/csl.h ================================================================= --- branches/comar-dbus/include/csl.h (original) +++ branches/comar-dbus/include/csl.h Mon Dec 3 14:15:28 2007 @@ -13,3 +13,4 @@ PyObject *py_call_method(const char *model, const char *app, const char *method, PyObject *args); PyObject *dbus_py_import(DBusMessage *msg); void dbus_py_export(DBusMessageIter *iter, PyObject *obj); +int py_check_args(PyObject *tuple); Modified: branches/comar-dbus/include/utility.h ================================================================= --- branches/comar-dbus/include/utility.h (original) +++ branches/comar-dbus/include/utility.h Mon Dec 3 14:15:28 2007 @@ -7,7 +7,9 @@ ** option) any later version. Please read the COPYING file. */ +int check_file(const char *fname); unsigned char *load_file(const char *fname, int *sizeptr); int check_interface_format(const char *interface); int check_path_format(const char *path); char *get_script_path(const char *interface, const char *path); +unsigned long time_diff(struct timeval *start, struct timeval *end); Modified: branches/comar-dbus/src/csl.c ================================================================= --- branches/comar-dbus/src/csl.c (original) +++ branches/comar-dbus/src/csl.c Mon Dec 3 14:15:28 2007 @@ -27,6 +27,30 @@ return 0; } +int +py_check_args(PyObject *tuple) +{ + PyObject *pItem, *pKey; + int i; + + if (!PyTuple_Check(tuple)) { + return 0; + } + + for (i == 0; i < PyTuple_Size(tuple); i++) { + pItem = PyTuple_GetItem(tuple, i); + if (!PyTuple_Check(pItem) || PyTuple_Size(pItem) != 2) { + return 0; + } + pKey = PyTuple_GetItem(pItem, 0); + if (!PyString_Check(pKey)) { + return 0; + } + } + + return 1; +} + //! Call model's method with given arguments PyObject * py_call_method(const char *model, const char *path, const char *method, PyObject *args) Modified: branches/comar-dbus/src/dbus.c ================================================================= --- branches/comar-dbus/src/dbus.c (original) +++ branches/comar-dbus/src/dbus.c Mon Dec 3 14:15:28 2007 @@ -54,6 +54,20 @@ } static void +dbus_send(DBusConnection *conn, DBusMessage *reply) +{ + dbus_uint32_t serial = 0; + + if (!dbus_connection_send(conn, reply, &serial)) { + log_error("Out Of Memory!\n"); + exit(1); + } + + dbus_connection_flush(conn); + dbus_message_unref(reply); +} + +static void dbus_method_call() { DBusMessage *reply; @@ -61,31 +75,35 @@ dbus_uint32_t serial = 0; PyObject *obj, *ret; + struct timeval time_start, time_end; + unsigned long msec; + const char *interface = dbus_message_get_interface(my_proc.bus_msg); const char *path = dbus_message_get_path(my_proc.bus_msg); const char *method = dbus_message_get_member(my_proc.bus_msg); dbus_bool_t no_reply = dbus_message_get_no_reply(my_proc.bus_msg); - if (!check_interface_format(interface)) { - log_error("Invalid interface: %s\n", interface); - if (!no_reply) { - reply = dbus_message_new_error(my_proc.bus_msg, DBUS_ERROR_FAILED, "Invalid interface"); - } - } - else if (!check_path_format(path)) { - log_error("Invalid application\n"); + Py_Initialize(); + + obj = dbus_py_import(my_proc.bus_msg); + obj = PyList_GetItem(obj, 0); + + if (!py_check_args(obj)) { + log_error("%s.%s() argument format is not valid.\n", interface, method); if (!no_reply) { - reply = dbus_message_new_error(my_proc.bus_msg, DBUS_ERROR_FAILED, "Invalid application"); + reply = dbus_message_new_error(my_proc.bus_msg, DBUS_ERROR_FAILED, "Argument format not valid"); } } else { - Py_Initialize(); + log_debug(LOG_CALL, "Executing %s.%s (%s)\n", interface, method, path); - obj = dbus_py_import(my_proc.bus_msg); - obj = PyList_GetItem(obj, 0); - log_debug(LOG_CALL, "Calling %s.%s (%s)\n", interface, method, path); + gettimeofday(&time_start, NULL); ret = py_call_method(interface, path, method, obj); + gettimeofday(&time_end, NULL); + msec = time_diff(&time_start, &time_end); + + log_debug(LOG_PERF, "Execution took %.3f seconds\n", (float) msec / 1000); if (ret == NULL) { reply = log_exception(my_proc.bus_msg, my_proc.bus_conn); @@ -95,9 +113,10 @@ dbus_message_iter_init_append(reply, &iter); dbus_py_export(&iter, ret); } - Py_Finalize(); } + Py_Finalize(); + if (!no_reply) { if (!dbus_connection_send(my_proc.bus_conn, reply, &serial)) { log_error("Out Of Memory!\n"); @@ -115,8 +134,10 @@ int size; DBusConnection *conn; - DBusMessage *msg; + DBusMessage *msg, *reply; + DBusMessageIter iter; DBusError err; + dbus_uint32_t serial = 0; int ret; const char *unique_name; PyObject *args; @@ -132,7 +153,7 @@ exit(1); } - ret = dbus_bus_request_name(conn, cfg_bus_name, DBUS_NAME_FLAG_REPLACE_EXISTING , &err); + ret = dbus_bus_request_name(conn, cfg_bus_name, DBUS_NAME_FLAG_REPLACE_EXISTING, &err); if (dbus_error_is_set(&err)) { log_error("Name Error (%s)\n", err.message); dbus_error_free(&err); @@ -145,6 +166,8 @@ unique_name = dbus_bus_get_unique_name(conn); log_info("Listening on %s (%s)...\n", cfg_bus_name, unique_name); + const char *introspection = load_file("/home/bahadir/repos/works/comar-dbus/introspection.xml", NULL); + while (1) { dbus_connection_read_write(conn, 0); msg = dbus_connection_pop_message(conn); @@ -159,21 +182,53 @@ continue; } + const char *sender = dbus_message_get_sender(msg); + const char *interface = dbus_message_get_interface(msg); + const char *path = dbus_message_get_path(msg); + const char *method = dbus_message_get_member(msg); + dbus_bool_t no_reply = dbus_message_get_no_reply(msg); + switch (dbus_message_get_type(msg)) { case DBUS_MESSAGE_TYPE_METHOD_CALL: - log_debug(LOG_DBUS, "Caught message call: %s.%s\n", dbus_message_get_interface(msg), dbus_message_get_member(msg)); + log_debug(LOG_DBUS, "DBus method call [%s.%s] from [%s]\n", interface, method, sender); if (dbus_message_has_interface(msg, "org.freedesktop.DBus.Introspectable")) { if (dbus_message_has_member(msg, "Introspect")) { - // Give introspection + // FIXME: Give introspection } } else if (dbus_message_get_type(msg) == DBUS_MESSAGE_TYPE_METHOD_CALL) { - proc_fork(dbus_method_call, "ComarDBusJob", conn, msg); + if (!check_interface_format(interface)) { + log_error("Invalid interface: %s\n", interface); + if (!no_reply) { + reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "Invalid interface"); + dbus_send(conn, reply); + } + } + else if (!check_path_format(path)) { + log_error("Invalid object path: %s\n", path); + if (!no_reply) { + reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "Invalid object path"); + dbus_send(conn, reply); + } + } + else { + char *script_path = get_script_path(interface, path); + if (!check_file(script_path)) { + log_error("Interface/object path does not exist.\n", interface, path); + if (!no_reply) { + reply = dbus_message_new_error(msg, DBUS_ERROR_FAILED, "Interface/object path does not exist."); + dbus_send(conn, reply); + } + } + else { + proc_fork(dbus_method_call, "ComarDBusJob", conn, msg); + } + free(script_path); + } } break; case DBUS_MESSAGE_TYPE_SIGNAL: - args = dbus_py_import(msg); - log_debug(LOG_DBUS, "Caught signal: %s.%s\n", dbus_message_get_interface(msg), dbus_message_get_member(msg)); + log_debug(LOG_DBUS, "DBus signal [%s.%s] from [%s]\n", interface, method, sender); break; } } Modified: branches/comar-dbus/src/main.c ================================================================= --- branches/comar-dbus/src/main.c (original) +++ branches/comar-dbus/src/main.c Mon Dec 3 14:15:28 2007 @@ -23,24 +23,31 @@ struct ProcChild *p; int size; + // l10n setlocale(LC_MESSAGES, ""); bindtextdomain("comar", "/usr/share/locale"); bind_textdomain_codeset("comar", "UTF-8"); bind_textdomain_codeset("libc", "UTF-8"); textdomain("comar"); + // Parse commandline options cfg_init(argc, argv); + // Only root can register system bus if (cfg_bus_type == DBUS_BUS_SYSTEM && getuid() != 0) { puts(_("System service should be started as root.")); exit(1); } + // Initialize proc_init(argc, argv, "Comar"); + // Start logging log_start(); + // Listen for DBus calls proc_fork(dbus_listen, "ComarDBus", NULL, NULL); + while (1) { if (shutdown_activated || my_proc.nr_children == 0) { proc_finish(); Modified: branches/comar-dbus/src/utility.c ================================================================= --- branches/comar-dbus/src/utility.c (original) +++ branches/comar-dbus/src/utility.c Mon Dec 3 14:15:28 2007 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "cfg.h" @@ -20,6 +21,13 @@ const char *valid_interface_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz."; const char *path_prefix = "/package/"; +int +check_file(const char *fname) +{ + struct stat fs; + return (stat(fname, &fs) == 0); +} + unsigned char * load_file(const char *fname, int *sizeptr) { @@ -68,6 +76,10 @@ { int i; + if (interface == NULL) { + return 0; + } + for (i = 0; i < strlen(interface); i++) { if (!in_str(interface[i], valid_interface_chars)) { return 0; @@ -81,6 +93,10 @@ { int i; + if (path == NULL) { + return 0; + } + if (strncmp(path, path_prefix, strlen(path_prefix))) { return 0; } @@ -140,3 +156,13 @@ free(model); return realpath; } + +unsigned long +time_diff(struct timeval *start, struct timeval *end) +{ + unsigned long msec; + + msec = (end->tv_sec * 1000) + (end->tv_usec / 1000); + msec -= (start->tv_sec * 1000) + (start->tv_usec / 1000); + return msec; +} From uludag-commits at pardus.org.tr Mon Dec 3 15:07:09 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 15:07:09 +0200 (EET) Subject: [Uludag-commits] r16211 - trunk/pardusman/src Message-ID: <20071203130709.229427C002F@liste.uludag.org.tr> Author: caglar Date: Mon Dec 3 15:07:08 2007 New Revision: 16211 Modified: trunk/pardusman/src/packages.py trunk/pardusman/src/project.py Log: source index olmadan da CD yapabil from Bahadır, deneme #1 Modified: trunk/pardusman/src/packages.py ================================================================= --- trunk/pardusman/src/packages.py (original) +++ trunk/pardusman/src/packages.py Mon Dec 3 15:07:08 2007 @@ -118,7 +118,6 @@ self.inst_size = 0 self.packages = {} self.components = {} - self.distribution = None def parse_index(self, console=None, update_repo=False): path = fetch_uri(self.base_uri, self.cache_dir, self.index_name, console, update_repo) @@ -129,15 +128,12 @@ doc = piksemel.parseString(data) else: doc = piksemel.parse(path) - self.distribution = doc.getTag('Distribution') for tag in doc.tags('Package'): p = Package(tag) self.packages[p.name] = p self.size += p.size self.inst_size += p.inst_size - for tag in doc.tags('Component'): - c = Component(tag) - self.components[c.name] = c + self.components[p.component] = [] for name in self.packages: p = self.packages[name] for name2 in p.depends: @@ -146,7 +142,7 @@ else: print "Error: package %s depends on non existing package %s" % (p.name, name2) if self.components.has_key(p.component): - self.components[p.component].packages.append(p.name) + self.components[p.component].append(p.name) from pisi.graph import Digraph, CycleException dep_graph = Digraph() for name in self.packages: @@ -162,11 +158,8 @@ def make_index(self, package_list): doc = piksemel.newDocument("PISI") - doc.insertNode(self.distribution) for name in package_list: doc.insertNode(self.packages[name].node) - for name in self.components: - doc.insertNode(self.components[name].node) return doc.toPrettyString() def make_local_repo(self, path, package_list): @@ -201,7 +194,7 @@ collect(item) collect(package_name) if self.components.has_key("system.base"): - for item in self.components["system.base"].packages: + for item in self.components["system.base"]: deps.add(item) collect(item) return deps Modified: trunk/pardusman/src/project.py ================================================================= --- trunk/pardusman/src/project.py (original) +++ trunk/pardusman/src/project.py Mon Dec 3 15:07:08 2007 @@ -209,7 +209,7 @@ for dep in p.depends: collect(dep) for component in self.selected_components: - for package in repo.components[component].packages: + for package in repo.components[component]: collect(package) for package in self.selected_packages: collect(package) From uludag-commits at pardus.org.tr Mon Dec 3 15:09:28 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 15:09:28 +0200 (EET) Subject: [Uludag-commits] r16212 - trunk/pisi/pisi Message-ID: <20071203130928.DB1287C002F@liste.uludag.org.tr> Author: caglar Date: Mon Dec 3 15:09:28 2007 New Revision: 16212 Modified: trunk/pisi/pisi/__init__.py Log: stable pisi ile aynı olma kafa karışmasın... Modified: trunk/pisi/pisi/__init__.py ================================================================= --- trunk/pisi/pisi/__init__.py (original) +++ trunk/pisi/pisi/__init__.py Mon Dec 3 15:09:28 2007 @@ -16,7 +16,7 @@ import atexit import logging -__version__ = "1.1.5" +__version__ = "1.1.6" __all__ = [ 'api', 'configfile', 'db'] From uludag-commits at pardus.org.tr Mon Dec 3 16:34:19 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 16:34:19 +0200 (EET) Subject: [Uludag-commits] r16213 - trunk/pardusman/src Message-ID: <20071203143419.E3BDC7C0030@liste.uludag.org.tr> Author: bahadir.kandemir Date: Mon Dec 3 16:34:19 2007 New Revision: 16213 Modified: trunk/pardusman/src/browser.py Log: fix ui Modified: trunk/pardusman/src/browser.py ================================================================= --- trunk/pardusman/src/browser.py (original) +++ trunk/pardusman/src/browser.py Mon Dec 3 16:34:19 2007 @@ -82,14 +82,15 @@ class Component(QCheckListItem): - def __init__(self, browser, comp): + def __init__(self, browser, comp, packages): self.browser = browser self.comp = comp - QCheckListItem.__init__(self, browser.comps, comp.name, QCheckListItem.CheckBox) + self.packages = packages + QCheckListItem.__init__(self, browser.comps, comp, QCheckListItem.CheckBox) def stateChange(self, bool): packages = self.browser.packages - for name in self.comp.packages: + for name in self.packages: packages[name].stateChange(bool) self.browser.list.triggerUpdate() @@ -249,7 +250,7 @@ self.packages[name] = Package(self, repo.packages[name]) self.components = {} for name in repo.components: - self.components[name] = Component(self, repo.components[name]) + self.components[name] = Component(self, name, repo.components[name]) self.nr_paks = 0 self.total = 0 self.total_zip = 0 @@ -264,7 +265,7 @@ item = self.comps.firstChild() while item: if item.isOn(): - comps.append(item.comp.name) + comps.append(item.comp) item = item.nextSibling() selpaks = [] @@ -281,7 +282,7 @@ for name in components: item = self.comps.firstChild() while item: - if item.comp.name == name: + if item.comp == name: item.setState(QCheckListItem.On) break item = item.nextSibling() From uludag-commits at pardus.org.tr Mon Dec 3 21:16:12 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 21:16:12 +0200 (EET) Subject: [Uludag-commits] r16214 - trunk/tasma/package-manager/po Message-ID: <20071203191612.3F64A7C002F@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Dec 3 21:16:11 2007 New Revision: 16214 Modified: trunk/tasma/package-manager/po/tr.po Log: Some translation fixes including a bug report\nBUG:FIXED:6540 Modified: trunk/tasma/package-manager/po/tr.po ================================================================= --- trunk/tasma/package-manager/po/tr.po (original) +++ trunk/tasma/package-manager/po/tr.po Mon Dec 3 21:16:11 2007 @@ -8,13 +8,14 @@ # Eray Ozkural , 2005. # Görkem Çetin , 2006. # Faik Uygur , 2006, 2007. +# Ozan Çağlayan , 2007. msgid "" msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-26 16:27+0200\n" -"PO-Revision-Date: 2007-05-13 21:12+0300\n" -"Last-Translator: Faik Uygur \n" +"PO-Revision-Date: 2007-12-03 20:58+0200\n" +"Last-Translator: Ozan Çağlayan \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -396,7 +397,7 @@ #: src/package-manager.py:61 msgid "Developer" -msgstr "" +msgstr "Geliştirici" #: src/package-manager.py:62 msgid "Original Author" @@ -481,9 +482,8 @@ msgstr "Sürüm: " #: src/package-manager.py:416 -#, fuzzy msgid "Repository: " -msgstr "Depo Adı" +msgstr "Depo: " #: src/package-manager.py:417 msgid "Package Size: " @@ -539,7 +539,6 @@ msgstr "%1: [%2] ile çakışıyor\n" #: src/package-manager.py:525 -#, fuzzy msgid "" "\n" "Remove the following conflicting packages?" From uludag-commits at pardus.org.tr Mon Dec 3 21:41:40 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 21:41:40 +0200 (EET) Subject: [Uludag-commits] r16215 - trunk/tasma/package-manager/po Message-ID: <20071203194140.70E627C002F@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Dec 3 21:41:40 2007 New Revision: 16215 Modified: trunk/tasma/package-manager/po/tr.po Log: revert to last rev. Modified: trunk/tasma/package-manager/po/tr.po ================================================================= --- trunk/tasma/package-manager/po/tr.po (original) +++ trunk/tasma/package-manager/po/tr.po Mon Dec 3 21:41:40 2007 @@ -8,14 +8,13 @@ # Eray Ozkural , 2005. # Görkem Çetin , 2006. # Faik Uygur , 2006, 2007. -# Ozan Çağlayan , 2007. msgid "" msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-26 16:27+0200\n" -"PO-Revision-Date: 2007-12-03 20:58+0200\n" -"Last-Translator: Ozan Çağlayan \n" +"PO-Revision-Date: 2007-05-13 21:12+0300\n" +"Last-Translator: Faik Uygur \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -397,7 +396,7 @@ #: src/package-manager.py:61 msgid "Developer" -msgstr "Geliştirici" +msgstr "" #: src/package-manager.py:62 msgid "Original Author" @@ -482,8 +481,9 @@ msgstr "Sürüm: " #: src/package-manager.py:416 +#, fuzzy msgid "Repository: " -msgstr "Depo: " +msgstr "Depo Adı" #: src/package-manager.py:417 msgid "Package Size: " @@ -539,6 +539,7 @@ msgstr "%1: [%2] ile çakışıyor\n" #: src/package-manager.py:525 +#, fuzzy msgid "" "\n" "Remove the following conflicting packages?" From uludag-commits at pardus.org.tr Mon Dec 3 21:43:02 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 3 Dec 2007 21:43:02 +0200 (EET) Subject: [Uludag-commits] r16216 - trunk/tasma/package-manager/po Message-ID: <20071203194302.7486E7C002F@liste.uludag.org.tr> Author: ozan.caglayan Date: Mon Dec 3 21:43:02 2007 New Revision: 16216 Modified: trunk/tasma/package-manager/po/tr.po Log: BUG:FIXED:6540 Modified: trunk/tasma/package-manager/po/tr.po ================================================================= --- trunk/tasma/package-manager/po/tr.po (original) +++ trunk/tasma/package-manager/po/tr.po Mon Dec 3 21:43:02 2007 @@ -8,13 +8,14 @@ # Eray Ozkural , 2005. # Görkem Çetin , 2006. # Faik Uygur , 2006, 2007. +# Ozan Çağlayan , 2007. msgid "" msgstr "" "Project-Id-Version: tr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-26 16:27+0200\n" -"PO-Revision-Date: 2007-05-13 21:12+0300\n" -"Last-Translator: Faik Uygur \n" +"PO-Revision-Date: 2007-12-03 20:58+0200\n" +"Last-Translator: Ozan Çağlayan \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -396,7 +397,7 @@ #: src/package-manager.py:61 msgid "Developer" -msgstr "" +msgstr "Geliştirici" #: src/package-manager.py:62 msgid "Original Author" @@ -481,9 +482,8 @@ msgstr "Sürüm: " #: src/package-manager.py:416 -#, fuzzy msgid "Repository: " -msgstr "Depo Adı" +msgstr "Depo: " #: src/package-manager.py:417 msgid "Package Size: " @@ -539,7 +539,6 @@ msgstr "%1: [%2] ile çakışıyor\n" #: src/package-manager.py:525 -#, fuzzy msgid "" "\n" "Remove the following conflicting packages?" From uludag-commits at pardus.org.tr Tue Dec 4 09:08:39 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 09:08:39 +0200 (EET) Subject: [Uludag-commits] r16218 - trunk/tasma/display-config/src Message-ID: <20071204070839.68C09864256@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 09:08:39 2007 New Revision: 16218 Modified: trunk/tasma/display-config/src/mainview.py Log: Check for IO errors Modified: trunk/tasma/display-config/src/mainview.py ================================================================= --- trunk/tasma/display-config/src/mainview.py (original) +++ trunk/tasma/display-config/src/mainview.py Tue Dec 4 09:08:39 2007 @@ -79,7 +79,11 @@ def readConfig(self): p = parser.XorgParser() - p.parseFile(xorg_conf) + try: + p.parseFile(xorg_conf) + except IOError: + QMessageBox.critical(self, i18n("Error"), i18n("Unable to read configuration.")) + sys.exit(1) screenSec = p.getSections("Screen")[0] depth = screenSec.get("DefaultDepth", 0, 16) @@ -98,7 +102,11 @@ def writeConfig(self): p = parser.XorgParser() - p.parseFile(xorg_conf) + try: + p.parseFile(xorg_conf) + except IOError: + QMessageBox.critical(self, i18n("Error"), i18n("Unable to read configuration.")) + sys.exit(1) mode = str(self.modeList.currentText()) @@ -125,7 +133,11 @@ displaySec.set("Modes", mode, "800x600", "640x480") - open(xorg_conf, "w").write(p.toString()) + try: + open(xorg_conf, "w").write(p.toString()) + except IOError: + QMessageBox.critical(self, i18n("Error"), i18n("Unable to save configuration.")) + sys.exit(1) def slotApply(self): self.writeConfig() From uludag-commits at pardus.org.tr Tue Dec 4 09:15:13 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 09:15:13 +0200 (EET) Subject: [Uludag-commits] r16219 - in trunk/tasma/display-config: . po Message-ID: <20071204071513.9E52B864011@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 09:15:13 2007 New Revision: 16219 Added: trunk/tasma/display-config/po/display-config.pot Modified: trunk/tasma/display-config/setup.py Log: add pot file Modified: trunk/tasma/display-config/setup.py ================================================================= --- trunk/tasma/display-config/setup.py (original) +++ trunk/tasma/display-config/setup.py Tue Dec 4 09:15:13 2007 @@ -75,6 +75,6 @@ license = "GPL", application_data = app_data, executable_links = [('display-config','display-config.py')], - i18n = ('po', ['.']), + i18n = ('po', ['src']), kcontrol_modules = [ ('src/display-config.desktop','src/display-config.py')], ) From uludag-commits at pardus.org.tr Tue Dec 4 09:21:44 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 09:21:44 +0200 (EET) Subject: [Uludag-commits] r16220 - in trunk/tasma/display-config: . po Message-ID: <20071204072144.8A65C864256@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 09:21:44 2007 New Revision: 16220 Added: trunk/tasma/display-config/po/tr.po Modified: trunk/tasma/display-config/setup.py Log: translations Modified: trunk/tasma/display-config/setup.py ================================================================= --- trunk/tasma/display-config/setup.py (original) +++ trunk/tasma/display-config/setup.py Tue Dec 4 09:21:44 2007 @@ -67,8 +67,8 @@ kdedistutils.setup( name="display-config", version=version, - author="Developer", - author_email="user at pardus.org.tr", + author="Fatih Aşıcı", + author_email="fatih at pardus.org.tr", url="http://www.pardus.org.tr/", min_kde_version = "3.5.0", min_qt_version = "3.3.5", From uludag-commits at pardus.org.tr Tue Dec 4 09:52:35 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 09:52:35 +0200 (EET) Subject: [Uludag-commits] r16221 - in trunk/tasma/display-config: . src Message-ID: <20071204075235.1772E864448@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 09:52:34 2007 New Revision: 16221 Added: trunk/tasma/display-config/src/xorgparser.py - copied unchanged from r16209, trunk/tasma/display-config/src/parser.py Removed: trunk/tasma/display-config/src/parser.py Modified: trunk/tasma/display-config/setup.py trunk/tasma/display-config/src/display-config.desktop trunk/tasma/display-config/src/display-config.py trunk/tasma/display-config/src/mainview.py Log: fixes Modified: trunk/tasma/display-config/setup.py ================================================================= --- trunk/tasma/display-config/setup.py (original) +++ trunk/tasma/display-config/setup.py Tue Dec 4 09:52:34 2007 @@ -57,8 +57,9 @@ app_data = [ 'src/display-config.py', - ('/usr/kde/3.5/share/icons/hicolor/128x128/apps', ['src/display_manager.png']), + ('/usr/kde/3.5/share/icons/hicolor/128x128/apps', ['src/display_config.png']), 'src/mainview.py', + 'src/xorgparser.py', 'src/utility.py', 'src/display-config.desktop', 'help' Modified: trunk/tasma/display-config/src/display-config.desktop ================================================================= --- trunk/tasma/display-config/src/display-config.desktop (original) +++ trunk/tasma/display-config/src/display-config.desktop Tue Dec 4 09:52:34 2007 @@ -5,8 +5,8 @@ Name[es]=Administrador Muestra Name[nl]=Hedebeheer Name[pt_BR]=Gerenciador do Hede -GenericName=Sample Tasma Module -GenericName[tr]=Örnek Tasma Modülü +GenericName=Display Configuration +GenericName[tr]=Görüntü Yapılandırma GenericName[de]=Muster Tasma-Modul GenericName[pt_BR]=Módulo Tasma de Amostra GenericName[es]=Módulo Tasma de Muestra @@ -14,7 +14,8 @@ X-KDE-ModuleType=Library X-KDE-Library=display-config X-KDE-FactoryName=display_config +X-KDE-RootOnly=true Type=Application Icon=display_config -Exec=kcmshell display-config -Categories=QT;KDE;X-KDE-settings-system;X-KDE-tasma-system +Exec=display-config +Categories=QT;KDE;System;X-KDE-settings-system;X-KDE-tasma-system; Modified: trunk/tasma/display-config/src/display-config.py ================================================================= --- trunk/tasma/display-config/src/display-config.py (original) +++ trunk/tasma/display-config/src/display-config.py Tue Dec 4 09:52:34 2007 @@ -57,7 +57,7 @@ # KCModule factory -def create_display_manager(parent, name): +def create_display_config(parent, name): global kapp kapp = KApplication.kApplication() Modified: trunk/tasma/display-config/src/mainview.py ================================================================= --- trunk/tasma/display-config/src/mainview.py (original) +++ trunk/tasma/display-config/src/mainview.py Tue Dec 4 09:52:34 2007 @@ -15,7 +15,7 @@ import sys -import parser +import xorgparser from utility import * xorg_conf = "/etc/X11/xorg.conf" @@ -78,7 +78,7 @@ self.readConfig() def readConfig(self): - p = parser.XorgParser() + p = xorgparser.XorgParser() try: p.parseFile(xorg_conf) except IOError: @@ -101,7 +101,7 @@ self.modeList.setCurrentText(mode) def writeConfig(self): - p = parser.XorgParser() + p = xorgparser.XorgParser() try: p.parseFile(xorg_conf) except IOError: From uludag-commits at pardus.org.tr Tue Dec 4 09:59:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 09:59:34 +0200 (EET) Subject: [Uludag-commits] r16222 - trunk/tasma/display-config/src Message-ID: <20071204075935.024DD7C0063@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 09:59:34 2007 New Revision: 16222 Modified: trunk/tasma/display-config/src/mainview.py Log: Disable apply button if we dont have write access Modified: trunk/tasma/display-config/src/mainview.py ================================================================= --- trunk/tasma/display-config/src/mainview.py (original) +++ trunk/tasma/display-config/src/mainview.py Tue Dec 4 09:59:34 2007 @@ -72,6 +72,9 @@ self.connect(applyButton, SIGNAL("clicked()"), self.slotApply) + if not os.access(xorg_conf, os.W_OK): + applyButton.setDisabled(True) + self.modeList = modeList self.depthList = depthList From uludag-commits at pardus.org.tr Tue Dec 4 10:27:47 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 10:27:47 +0200 (EET) Subject: [Uludag-commits] r16223 - trunk/tasma/display-config/src Message-ID: <20071204082747.57A5C7C0067@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 10:27:47 2007 New Revision: 16223 Modified: trunk/tasma/display-config/src/mainview.py Log: Do not use sys.exit as it causes tasma to exit also Modified: trunk/tasma/display-config/src/mainview.py ================================================================= --- trunk/tasma/display-config/src/mainview.py (original) +++ trunk/tasma/display-config/src/mainview.py Tue Dec 4 10:27:47 2007 @@ -43,6 +43,10 @@ def __init__(self, parent): QWidget.__init__(self, parent) + if not os.access(xorg_conf, os.R_OK): + QLabel(i18n("Unable to read configuration."), self) + return + modeLabel = QLabel(i18n("Resolution:"), self) modeList = QComboBox(self) for mode in modes: @@ -86,7 +90,7 @@ p.parseFile(xorg_conf) except IOError: QMessageBox.critical(self, i18n("Error"), i18n("Unable to read configuration.")) - sys.exit(1) + return screenSec = p.getSections("Screen")[0] depth = screenSec.get("DefaultDepth", 0, 16) @@ -109,7 +113,7 @@ p.parseFile(xorg_conf) except IOError: QMessageBox.critical(self, i18n("Error"), i18n("Unable to read configuration.")) - sys.exit(1) + return mode = str(self.modeList.currentText()) @@ -140,7 +144,6 @@ open(xorg_conf, "w").write(p.toString()) except IOError: QMessageBox.critical(self, i18n("Error"), i18n("Unable to save configuration.")) - sys.exit(1) def slotApply(self): self.writeConfig() From uludag-commits at pardus.org.tr Tue Dec 4 10:28:25 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 10:28:25 +0200 (EET) Subject: [Uludag-commits] r16224 - in trunk/tasma/display-config: . src Message-ID: <20071204082825.8DFFE7C0067@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 10:28:25 2007 New Revision: 16224 Removed: trunk/tasma/display-config/src/display_config.png Modified: trunk/tasma/display-config/setup.py trunk/tasma/display-config/src/display-config.desktop Log: Use kde randr icon Modified: trunk/tasma/display-config/setup.py ================================================================= --- trunk/tasma/display-config/setup.py (original) +++ trunk/tasma/display-config/setup.py Tue Dec 4 10:28:25 2007 @@ -22,7 +22,6 @@ README AUTHORS src/*.ui - src/*.png src/*.py src/*.desktop po/*.po @@ -57,7 +56,6 @@ app_data = [ 'src/display-config.py', - ('/usr/kde/3.5/share/icons/hicolor/128x128/apps', ['src/display_config.png']), 'src/mainview.py', 'src/xorgparser.py', 'src/utility.py', Modified: trunk/tasma/display-config/src/display-config.desktop ================================================================= --- trunk/tasma/display-config/src/display-config.desktop (original) +++ trunk/tasma/display-config/src/display-config.desktop Tue Dec 4 10:28:25 2007 @@ -16,6 +16,6 @@ X-KDE-FactoryName=display_config X-KDE-RootOnly=true Type=Application -Icon=display_config +Icon=randr Exec=display-config Categories=QT;KDE;System;X-KDE-settings-system;X-KDE-tasma-system; From uludag-commits at pardus.org.tr Tue Dec 4 10:36:00 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 10:36:00 +0200 (EET) Subject: [Uludag-commits] r16225 - trunk/tasma/display-config/src Message-ID: <20071204083600.1CEE87C006D@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 10:35:59 2007 New Revision: 16225 Modified: trunk/tasma/display-config/src/mainview.py Log: fix Modified: trunk/tasma/display-config/src/mainview.py ================================================================= --- trunk/tasma/display-config/src/mainview.py (original) +++ trunk/tasma/display-config/src/mainview.py Tue Dec 4 10:35:59 2007 @@ -42,9 +42,10 @@ class widgetMain(QWidget): def __init__(self, parent): QWidget.__init__(self, parent) + vb = QVBoxLayout(self, 6, 6, "mainLayout") if not os.access(xorg_conf, os.R_OK): - QLabel(i18n("Unable to read configuration."), self) + vb.addWidget(QLabel(i18n("Unable to read configuration."), self)) return modeLabel = QLabel(i18n("Resolution:"), self) @@ -60,8 +61,6 @@ applyButton = QPushButton(i18n("Apply"), self) - vb = QVBoxLayout(self, 6, 6, "mainLayout") - vb.addWidget(modeLabel) vb.addWidget(modeList) vb.addWidget(depthLabel) From uludag-commits at pardus.org.tr Tue Dec 4 10:52:59 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 10:52:59 +0200 (EET) Subject: [Uludag-commits] r16226 - trunk/tasma/display-config Message-ID: <20071204085259.CA6DA7C0072@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 10:52:59 2007 New Revision: 16226 Modified: trunk/tasma/display-config/setup.py Log: add setup.py to archive Modified: trunk/tasma/display-config/setup.py ================================================================= --- trunk/tasma/display-config/setup.py (original) +++ trunk/tasma/display-config/setup.py Tue Dec 4 10:52:59 2007 @@ -21,6 +21,7 @@ distfiles = """ README AUTHORS + *.py src/*.ui src/*.py src/*.desktop From uludag-commits at pardus.org.tr Tue Dec 4 14:28:51 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 14:28:51 +0200 (EET) Subject: [Uludag-commits] r16227 - in trunk/python-modules/pardus-python: . pardus Message-ID: <20071204122851.B4520864300@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Dec 4 14:28:51 2007 New Revision: 16227 Added: trunk/python-modules/pardus-python/pardus/diskutils.py Modified: trunk/python-modules/pardus-python/pardus/__init__.py trunk/python-modules/pardus-python/setup.py Log: diskutils module - allows getting a list of bootable devices, also boot orders Modified: trunk/python-modules/pardus-python/pardus/__init__.py ================================================================= --- trunk/python-modules/pardus-python/pardus/__init__.py (original) +++ trunk/python-modules/pardus-python/pardus/__init__.py Tue Dec 4 14:28:51 2007 @@ -13,6 +13,7 @@ __version__ = "0.1" __all__ = ["dirutils", + "diskutils", "fileutils", "procutils", "strutils", Modified: trunk/python-modules/pardus-python/setup.py ================================================================= --- trunk/python-modules/pardus-python/setup.py (original) +++ trunk/python-modules/pardus-python/setup.py Tue Dec 4 14:28:51 2007 @@ -1,8 +1,21 @@ #-*- coding: utf-8 -*- +import os.path from distutils.core import setup, Extension +from distutils.command.install import install + import pardus +class Install(install): + def finalize_options(self): + # NOTE: for Pardus distribution + if os.path.exists("/etc/pardus-release"): + self.install_platlib = '$base/lib/pardus' + self.install_purelib = '$base/lib/pardus' + install.finalize_options(self) + + def run(self): + install.run(self) setup(name="pardus", version=pardus.versionString(), @@ -16,4 +29,4 @@ ext_modules = [Extension('pardus.xorg.capslock', sources=['pardus/xorg/capslock.c'], libraries=['X11'])], - ) + cmdclass = {'install' : Install}) From uludag-commits at pardus.org.tr Tue Dec 4 14:37:10 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 14:37:10 +0200 (EET) Subject: [Uludag-commits] r16228 - trunk/comar/zorg Message-ID: <20071204123710.85364864256@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 14:37:10 2007 New Revision: 16228 Modified: trunk/comar/zorg/zorg Log: enable composite with kernel option xorg=composite Modified: trunk/comar/zorg/zorg ================================================================= --- trunk/comar/zorg/zorg (original) +++ trunk/comar/zorg/zorg Tue Dec 4 14:37:10 2007 @@ -48,6 +48,7 @@ VendorName "%(VENDORNAME)s" BoardName "%(BOARDNAME)s" %(BUSID)s + %(AIGLX_OPTS)s EndSection """ @@ -117,6 +118,11 @@ EndSection """ +template_nvidia_aiglx = """ + Option "AddARGBGLXVisuals" "true" + Option "AllowGLXWithComposite" "true" +""" + template_screen = """ Section "Screen" Identifier "Screen%(N)s" @@ -183,7 +189,7 @@ EndSection Section "Extensions" -# Option "Composite" "Enable" + %(COMPOSITE)s EndSection Section "dri" @@ -248,6 +254,7 @@ # Screen 1 "Screen1" RightOf "Screen0" Option "Xinerama" "off" Option "Clone" "off" + %(AIGLX_OPTS)s EndSection """ @@ -894,6 +901,16 @@ keys_vc["VENDORNAME"] = cards[i].VendorName keys_vc["BOARDNAME"] = cards[i].BoardName keys_vc["BUSID"] = cards[i].BusId + + keys_vc["AIGLX_OPTS"] = "" + + if "composite" in getKernelOpt(): + if cards[i].Driver in ("ati", "intel"): + keys_vc["AIGLX_OPTS"] = 'Option "XAANoOffscreenPixmaps" "true"' + + elif cards[i].Driver == "nvidia": + keys_vc["AIGLX_OPTS"] = template_nvidia_aiglx + sec += template_videocard % keys_vc return sec @@ -1035,6 +1052,18 @@ keysTouchpad(keys_main) keys_main["KEYMAP"] = queryKeymap() + # Enable composite extension if requested + keys_main["AIGLX_OPTS"] = "" + + if "composite" in getKernelOpt(): + keys_main["COMPOSITE"] = 'Option "Composite" "enable"' + + if cards[0].Driver in ("ati", "intel"): + keys_main["AIGLX_OPTS"] = 'Option "AIGLX" "true"' + + else: + keys_main["COMPOSITE"] = '#Option "Composite" "enable"' + write_tmpl(keys_main) def safeConfigure(_driver = "vesa"): From uludag-commits at pardus.org.tr Tue Dec 4 14:40:56 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 14:40:56 +0200 (EET) Subject: [Uludag-commits] r16229 - trunk/comar/zorg Message-ID: <20071204124056.A8245864300@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 14:40:56 2007 New Revision: 16229 Modified: trunk/comar/zorg/zorg Log: fix Modified: trunk/comar/zorg/zorg ================================================================= --- trunk/comar/zorg/zorg (original) +++ trunk/comar/zorg/zorg Tue Dec 4 14:40:56 2007 @@ -904,7 +904,7 @@ keys_vc["AIGLX_OPTS"] = "" - if "composite" in getKernelOpt(): + if "composite" in getKernelOpt("xorg"): if cards[i].Driver in ("ati", "intel"): keys_vc["AIGLX_OPTS"] = 'Option "XAANoOffscreenPixmaps" "true"' @@ -1055,7 +1055,7 @@ # Enable composite extension if requested keys_main["AIGLX_OPTS"] = "" - if "composite" in getKernelOpt(): + if "composite" in getKernelOpt("xorg"): keys_main["COMPOSITE"] = 'Option "Composite" "enable"' if cards[0].Driver in ("ati", "intel"): From uludag-commits at pardus.org.tr Tue Dec 4 15:06:05 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 15:06:05 +0200 (EET) Subject: [Uludag-commits] r16230 - trunk/comar/zorg Message-ID: <20071204130605.2E7F2864309@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 15:06:04 2007 New Revision: 16230 Modified: trunk/comar/zorg/zorg Log: unutmadan Modified: trunk/comar/zorg/zorg ================================================================= --- trunk/comar/zorg/zorg (original) +++ trunk/comar/zorg/zorg Tue Dec 4 15:06:04 2007 @@ -1108,6 +1108,9 @@ keys_main["SEC_SYNAPTICS"] = "" keys_main["SYNAPTICS_LAY"] = "" + keys_main["AIGLX_OPTS"] = "" + keys_main["COMPOSITE"] = '#Option "Composite" "enable"' + write_tmpl(keys_main) def activeCardChanged(cards): From uludag-commits at pardus.org.tr Tue Dec 4 15:11:53 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 15:11:53 +0200 (EET) Subject: [Uludag-commits] r16231 - trunk/comar/zorg Message-ID: <20071204131153.76509864300@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 15:11:53 2007 New Revision: 16231 Modified: trunk/comar/zorg/zorg Log: ati needs 24 bit for composite Modified: trunk/comar/zorg/zorg ================================================================= --- trunk/comar/zorg/zorg (original) +++ trunk/comar/zorg/zorg Tue Dec 4 15:11:53 2007 @@ -944,6 +944,9 @@ else: keys_mon["DEPTH"] = "16" + if cards[i].Driver == "ati" and "composite" in getKernelOpt("xorg"): + keys_mon["DEPTH"] = "24" + sec_monitor += template_monitor % keys_mon sec_screen += template_screen % keys_mon From uludag-commits at pardus.org.tr Tue Dec 4 19:32:39 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 19:32:39 +0200 (EET) Subject: [Uludag-commits] r16232 - trunk/python-modules/pardus-python/pardus Message-ID: <20071204173240.058737C0099@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Dec 4 19:32:39 2007 New Revision: 16232 Modified: trunk/python-modules/pardus-python/pardus/diskutils.py Log: Get all block devices except floppy and ram disks and loop devices. Modified: trunk/python-modules/pardus-python/pardus/diskutils.py ================================================================= --- trunk/python-modules/pardus-python/pardus/diskutils.py (original) +++ trunk/python-modules/pardus-python/pardus/diskutils.py Tue Dec 4 19:32:39 2007 @@ -13,9 +13,9 @@ """sysutils module provides basic file I/0 utility functions.""" import binascii +import fnmatch import struct import os -import glob class EDD: def __init__(self): @@ -25,10 +25,12 @@ def blockDevices(self): devices = [] - for dev_type in ["hd*", "sd*"]: - sysfs_devs = glob.glob("/sys/block/" + dev_type) - for sysfs_dev in sysfs_devs: - devices.append("/dev/" + os.path.basename(sysfs_dev)) + for sysfs_dev in os.listdir("/sys/block"): + if filter(lambda x: fnmatch.fnmatch(sysfs_dev, x), ["fd*", "loop*", "ram*"]): + continue + dev_name = os.path.basename(sysfs_dev) + dev_name = dev_name.replace("!", "/") + devices.append("/dev/" + dev_name) devices.sort() return devices From uludag-commits at pardus.org.tr Tue Dec 4 20:09:38 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 20:09:38 +0200 (EET) Subject: [Uludag-commits] r16233 - trunk/tasma/display-config/src Message-ID: <20071204180938.B2C55864300@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 20:09:38 2007 New Revision: 16233 Modified: trunk/tasma/display-config/src/display-config.desktop Log: run as root user Modified: trunk/tasma/display-config/src/display-config.desktop ================================================================= --- trunk/tasma/display-config/src/display-config.desktop (original) +++ trunk/tasma/display-config/src/display-config.desktop Tue Dec 4 20:09:38 2007 @@ -11,6 +11,8 @@ GenericName[pt_BR]=Módulo Tasma de Amostra GenericName[es]=Módulo Tasma de Muestra GenericName[nl]=Voorbeeld Tasma module +X-KDE-SubstituteUID=true +X-KDE-Username=root X-KDE-ModuleType=Library X-KDE-Library=display-config X-KDE-FactoryName=display_config From uludag-commits at pardus.org.tr Tue Dec 4 20:14:25 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 20:14:25 +0200 (EET) Subject: [Uludag-commits] r16234 - in branches/yali4: . pics Message-ID: <20071204181425.CD5DA864309@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Dec 4 20:14:25 2007 New Revision: 16234 Added: branches/yali4/ branches/yali4/main.ui branches/yali4/pics/ branches/yali4/pics/background.png (contents, props changed) branches/yali4/pics/trans.png (contents, props changed) Log: Yali4 Qt4 Rocks From uludag-commits at pardus.org.tr Tue Dec 4 21:47:22 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 21:47:22 +0200 (EET) Subject: [Uludag-commits] r16235 - in branches/comar-dbus: include src tests Message-ID: <20071204194722.579E47C0061@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Dec 4 21:47:22 2007 New Revision: 16235 Added: branches/comar-dbus/tests/sample-async-cli.py Modified: branches/comar-dbus/include/csl.h branches/comar-dbus/src/csl.c branches/comar-dbus/src/dbus.c branches/comar-dbus/tests/sample-cli.py Log: Removed support for keyword and optional arguments. This breaks COMAR 1.* compatibility, but is required to serve a meaningfull introspection. It's time to work on introspection code... Modified: branches/comar-dbus/include/csl.h ================================================================= --- branches/comar-dbus/include/csl.h (original) +++ branches/comar-dbus/include/csl.h Tue Dec 4 21:47:22 2007 @@ -13,4 +13,3 @@ PyObject *py_call_method(const char *model, const char *app, const char *method, PyObject *args); PyObject *dbus_py_import(DBusMessage *msg); void dbus_py_export(DBusMessageIter *iter, PyObject *obj); -int py_check_args(PyObject *tuple); Modified: branches/comar-dbus/src/csl.c ================================================================= --- branches/comar-dbus/src/csl.c (original) +++ branches/comar-dbus/src/csl.c Tue Dec 4 21:47:22 2007 @@ -27,30 +27,6 @@ return 0; } -int -py_check_args(PyObject *tuple) -{ - PyObject *pItem, *pKey; - int i; - - if (!PyTuple_Check(tuple)) { - return 0; - } - - for (i == 0; i < PyTuple_Size(tuple); i++) { - pItem = PyTuple_GetItem(tuple, i); - if (!PyTuple_Check(pItem) || PyTuple_Size(pItem) != 2) { - return 0; - } - pKey = PyTuple_GetItem(pItem, 0); - if (!PyString_Check(pKey)) { - return 0; - } - } - - return 1; -} - //! Call model's method with given arguments PyObject * py_call_method(const char *model, const char *path, const char *method, PyObject *args) @@ -102,23 +78,9 @@ return NULL; } - pFuncCode = PyObject_GetAttrString(pFunc, "func_code"); - arg_count = PyInt_AsLong(PyObject_GetAttrString(pFuncCode, "co_argcount")); - argNames = PyObject_GetAttrString(pFuncCode, "co_varnames"); - argNames = PyTuple_GetSlice(argNames, 0, arg_count); - - pArgs = PyTuple_New(0); + pArgs = PyList_AsTuple(args); pkArgs = PyDict_New(); - for (i = 0; i < PyTuple_Size(args); i++) { - pKey = PyTuple_GetItem(PyTuple_GetItem(args, i), 0); - pValue = PyTuple_GetItem(PyTuple_GetItem(args, i), 1); - if (!py_in_tuple(argNames, pKey)) { - continue; - } - PyDict_SetItem(pkArgs, pKey, pValue); - } - pReturn = PyObject_Call(pFunc, pArgs, pkArgs); if (!pReturn) { Modified: branches/comar-dbus/src/dbus.c ================================================================= --- branches/comar-dbus/src/dbus.c (original) +++ branches/comar-dbus/src/dbus.c Tue Dec 4 21:47:22 2007 @@ -87,32 +87,26 @@ Py_Initialize(); obj = dbus_py_import(my_proc.bus_msg); - obj = PyList_GetItem(obj, 0); - if (!py_check_args(obj)) { - log_error("%s.%s() argument format is not valid.\n", interface, method); - if (!no_reply) { - reply = dbus_message_new_error(my_proc.bus_msg, DBUS_ERROR_FAILED, "Argument format not valid"); - } + gettimeofday(&time_start, NULL); + ret = py_call_method(interface, path, method, obj); + gettimeofday(&time_end, NULL); + msec = time_diff(&time_start, &time_end); + + if (msec / 1000 > 60) { + log_info("Execution of %s.%s (%s) took %.3f seconds\n", interface, method, path, (float) msec / 1000); } else { - log_debug(LOG_CALL, "Executing %s.%s (%s)\n", interface, method, path); - - gettimeofday(&time_start, NULL); - ret = py_call_method(interface, path, method, obj); - gettimeofday(&time_end, NULL); - msec = time_diff(&time_start, &time_end); - - log_debug(LOG_PERF, "Execution took %.3f seconds\n", (float) msec / 1000); + log_debug(LOG_PERF, "Execution of %s.%s (%s) took %.3f seconds\n", interface, method, path, (float) msec / 1000); + } - if (ret == NULL) { - reply = log_exception(my_proc.bus_msg, my_proc.bus_conn); - } - else if (!no_reply) { - reply = dbus_message_new_method_return(my_proc.bus_msg); - dbus_message_iter_init_append(reply, &iter); - dbus_py_export(&iter, ret); - } + if (ret == NULL) { + reply = log_exception(my_proc.bus_msg, my_proc.bus_conn); + } + else if (!no_reply) { + reply = dbus_message_new_method_return(my_proc.bus_msg); + dbus_message_iter_init_append(reply, &iter); + dbus_py_export(&iter, ret); } Py_Finalize(); @@ -166,8 +160,6 @@ unique_name = dbus_bus_get_unique_name(conn); log_info("Listening on %s (%s)...\n", cfg_bus_name, unique_name); - const char *introspection = load_file("/home/bahadir/repos/works/comar-dbus/introspection.xml", NULL); - while (1) { dbus_connection_read_write(conn, 0); msg = dbus_connection_pop_message(conn); Modified: branches/comar-dbus/tests/sample-cli.py ================================================================= --- branches/comar-dbus/tests/sample-cli.py (original) +++ branches/comar-dbus/tests/sample-cli.py Tue Dec 4 21:47:22 2007 @@ -5,9 +5,16 @@ def main(): bus = dbus.SystemBus() object = bus.get_object("tr.org.pardus.comar", "/package/mysql", introspect=False) + iface = dbus.Interface(object, "System.Package") - args = {"a": 1, "b": 2.0, "c": "3"} - print object.postInstall(tuple(args.items()), dbus_interface="System.Package") + def test(*args): + try: + print iface.postInstall(*args) + except Exception, e: + print e + + test(1, [1, 2, 3]) + test(1, [1, 2, 3], 1) if __name__ == '__main__': From uludag-commits at pardus.org.tr Tue Dec 4 21:50:54 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 21:50:54 +0200 (EET) Subject: [Uludag-commits] r16236 - trunk/comar/zorg Message-ID: <20071204195054.110AF7C0061@liste.uludag.org.tr> Author: fatih Date: Tue Dec 4 21:50:53 2007 New Revision: 16236 Modified: trunk/comar/zorg/zorg Log: enable -> Enable Modified: trunk/comar/zorg/zorg ================================================================= --- trunk/comar/zorg/zorg (original) +++ trunk/comar/zorg/zorg Tue Dec 4 21:50:53 2007 @@ -118,6 +118,8 @@ EndSection """ +composite_option = 'Option "Composite" "Enable"' + template_nvidia_aiglx = """ Option "AddARGBGLXVisuals" "true" Option "AllowGLXWithComposite" "true" @@ -1059,13 +1061,13 @@ keys_main["AIGLX_OPTS"] = "" if "composite" in getKernelOpt("xorg"): - keys_main["COMPOSITE"] = 'Option "Composite" "enable"' + keys_main["COMPOSITE"] = composite_option if cards[0].Driver in ("ati", "intel"): keys_main["AIGLX_OPTS"] = 'Option "AIGLX" "true"' else: - keys_main["COMPOSITE"] = '#Option "Composite" "enable"' + keys_main["COMPOSITE"] = '#%s' % composite_option write_tmpl(keys_main) @@ -1112,7 +1114,7 @@ keys_main["SYNAPTICS_LAY"] = "" keys_main["AIGLX_OPTS"] = "" - keys_main["COMPOSITE"] = '#Option "Composite" "enable"' + keys_main["COMPOSITE"] = '#%s' % composite_option write_tmpl(keys_main) From uludag-commits at pardus.org.tr Tue Dec 4 22:58:30 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 22:58:30 +0200 (EET) Subject: [Uludag-commits] r16237 - in branches/comar-dbus/tests: . code Message-ID: <20071204205830.566CB7C009D@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Dec 4 22:58:30 2007 New Revision: 16237 Added: branches/comar-dbus/tests/sample-gui.py Modified: branches/comar-dbus/tests/code/System_Package_apache.py branches/comar-dbus/tests/code/System_Package_mysql.py branches/comar-dbus/tests/sample-async-cli.py branches/comar-dbus/tests/sample-cli.py Log: sample qt4 client, and few changes to {a}sync test codes. Modified: branches/comar-dbus/tests/code/System_Package_apache.py ================================================================= --- branches/comar-dbus/tests/code/System_Package_apache.py (original) +++ branches/comar-dbus/tests/code/System_Package_apache.py Tue Dec 4 22:58:30 2007 @@ -4,6 +4,6 @@ import random import time -def postInstall(a, b=2.0): +def postInstall(a): time.sleep(random.randint(1, 3)) - return "a: %s\nb: %s" % (repr(a), repr(b)) + return "You said: '%s'" % a Modified: branches/comar-dbus/tests/code/System_Package_mysql.py ================================================================= --- branches/comar-dbus/tests/code/System_Package_mysql.py (original) +++ branches/comar-dbus/tests/code/System_Package_mysql.py Tue Dec 4 22:58:30 2007 @@ -1,5 +1,5 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -def postInstall(a, b=2): - return "a: %s\nb: %s" % (a, b) +def postInstall(a): + return "You said: '%s'" % a Modified: branches/comar-dbus/tests/sample-async-cli.py ================================================================= --- branches/comar-dbus/tests/sample-async-cli.py (original) +++ branches/comar-dbus/tests/sample-async-cli.py Tue Dec 4 22:58:30 2007 @@ -20,7 +20,7 @@ iface.postInstall(*args, **kwargs) time.sleep(0.5) # don't flood - test(1, 2) + test(1) loop = gobject.MainLoop() loop.run() Modified: branches/comar-dbus/tests/sample-cli.py ================================================================= --- branches/comar-dbus/tests/sample-cli.py (original) +++ branches/comar-dbus/tests/sample-cli.py Tue Dec 4 22:58:30 2007 @@ -13,8 +13,8 @@ except Exception, e: print e + test(1) test(1, [1, 2, 3]) - test(1, [1, 2, 3], 1) if __name__ == '__main__': From uludag-commits at pardus.org.tr Tue Dec 4 23:24:17 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 4 Dec 2007 23:24:17 +0200 (EET) Subject: [Uludag-commits] r16238 - in branches/yali4: . pics Message-ID: <20071204212417.7E5E0864256@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Dec 4 23:24:17 2007 New Revision: 16238 Added: branches/yali4/pics/helpBack.png (contents, props changed) branches/yali4/pics/logo.png (contents, props changed) Modified: branches/yali4/main.ui branches/yali4/pics/background.png Log: Almost completed.. Modified: branches/yali4/main.ui ================================================================= --- branches/yali4/main.ui (original) +++ branches/yali4/main.ui Tue Dec 4 23:24:17 2007 @@ -5,8 +5,8 @@ 0 0 - 1024 - 768 + 884 + 617 @@ -32,18 +32,18 @@ border-bottom-right-radius:8px; border-color: beige; border-left:none; - background-image:url('pics/trans.png'); + background-image:url('pics/helpBack.png'); padding:5px; padding-top:7px; } QPushButton { - background-color: orange; + background-color: #FF7308; border-style: outset; border-width: 2px; border-radius: 8px; border-color: beige; - font: bold 12px; + font: 12px; min-width: 5em; padding:6px; color:#FFF; @@ -52,18 +52,38 @@ QPushButton:pressed { background-color: rgb(224, 0, 0); border-style: inset; -} +} + +#buttonNext { + border-top-left-radius:none; + border-bottom-left-radius:none; + border-left-width: 1px; + min-width: 3em; +} + +#buttonBack { + border-top-right-radius:none; + border-bottom-right-radius:none; + border-right-width: 1px; + min-width: 3em; +} - - + + + + + 0 + 0 + + QFrame::NoFrame QFrame::Raised - + @@ -88,10 +108,33 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + pics/logo.png + + + false + + + - + @@ -194,7 +237,7 @@ - 300 + 280 16777215 @@ -285,6 +328,12 @@ QFrame::Raised + + 9 + + + 22 + @@ -318,17 +367,20 @@ + + 0 + - + - Back + « - + - Next + » Modified: branches/yali4/pics/background.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Wed Dec 5 09:15:59 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 09:15:59 +0200 (EET) Subject: [Uludag-commits] r16239 - trunk/tasma/service-manager/help/en Message-ID: <20071205071559.869BC864317@liste.uludag.org.tr> Author: gorkem Date: Wed Dec 5 09:15:59 2007 New Revision: 16239 Modified: trunk/tasma/service-manager/help/en/main_help.html Log: main help, english Modified: trunk/tasma/service-manager/help/en/main_help.html ================================================================= --- trunk/tasma/service-manager/help/en/main_help.html (original) +++ trunk/tasma/service-manager/help/en/main_help.html Wed Dec 5 09:15:59 2007 @@ -1,6 +1,6 @@ - Aide: Gestionnaire de Services + Help: Service Manager @@ -11,14 +11,13 @@
-

Gestionnaire de Services

+

Service Manager

-Pardus lance quelques services au cours du démarrage. Ce processus peut être contrôlé par l'utilisateur final, c'est à dire que certain services peuvent -être désactivés au démarrage alors que d'autres peuvent être ré-activés. Le Gestionnaire de Service peut être utilisé à cette fin. +Pardus runs some services during boot-up. This process can be controlled by the end user, i.e some services can be disabled during boot and some can be enabled again. Service Manager can be used to administrate this task.

-Une del à gauche du nom du service montre le statut du service correspondant. Une del rouge indique que le service n'est pas en cours d'exécution. Si elle est verte, c'est que le service est lancé. +A led on the left of a service name shows the status of the corresponding service. If this led is red, then the service is not running. If it's green, then the service is currently running.

-Pour lancer un service à l'arrêt, il suffit de cliquer sur le service puis sur le bouton "Démarrer" en bas. De même, pour arrêter un service, il suffit de cliquer sur le nom du service puis sur le boutton "Arrêter". +In order to run a stopped service, just click on the service and then the "Start" button on the bottom. Likewise, to start a service, it's enough to click on the service name and "Stop" button one after another. From uludag-commits at pardus.org.tr Wed Dec 5 09:59:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 09:59:31 +0200 (EET) Subject: [Uludag-commits] r16240 - trunk/tasma/tasma/src Message-ID: <20071205075931.59A32864256@liste.uludag.org.tr> Author: pinar Date: Wed Dec 5 09:59:31 2007 New Revision: 16240 Modified: trunk/tasma/tasma/src/ticonview.cpp trunk/tasma/tasma/src/ticonview.h Log: fixed bug#6629 Modified: trunk/tasma/tasma/src/ticonview.cpp ================================================================= --- trunk/tasma/tasma/src/ticonview.cpp (original) +++ trunk/tasma/tasma/src/ticonview.cpp Wed Dec 5 09:59:31 2007 @@ -179,6 +179,13 @@ _moduleinfo = moduleinfo; } +void TIconView::focusInEvent ( QFocusEvent* event ) { + + if(event->reason() == QFocusEvent::Tab) + setSelected(firstItem(), true); + +} + KCModuleInfo* TIconViewItem::moduleinfo() const { assert(_moduleinfo != NULL); Modified: trunk/tasma/tasma/src/ticonview.h ================================================================= --- trunk/tasma/tasma/src/ticonview.h (original) +++ trunk/tasma/tasma/src/ticonview.h Wed Dec 5 09:59:31 2007 @@ -60,6 +60,7 @@ virtual void keyPressEvent(QKeyEvent *event); virtual void contentsMouseDoubleClickEvent (QMouseEvent *event); virtual void contentsMousePressEvent(QMouseEvent* event); + virtual void focusInEvent ( QFocusEvent * e ); // virtual void contentsMouseMoveEvent(QMouseEvent* event); //this event causes crashing. private: From uludag-commits at pardus.org.tr Wed Dec 5 11:53:46 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 11:53:46 +0200 (EET) Subject: [Uludag-commits] r16241 - trunk/staj-projeleri/imzaci/src Message-ID: <20071205095346.CAF16864337@liste.uludag.org.tr> Author: dkurov Date: Wed Dec 5 11:53:46 2007 New Revision: 16241 Modified: trunk/staj-projeleri/imzaci/src/TODO.txt Log: Todo change test Modified: trunk/staj-projeleri/imzaci/src/TODO.txt ================================================================= --- trunk/staj-projeleri/imzaci/src/TODO.txt (original) +++ trunk/staj-projeleri/imzaci/src/TODO.txt Wed Dec 5 11:53:46 2007 @@ -3,4 +3,5 @@ 1)Write unit tests for tool 2)Handle M2Crypto exceptions in more user friendly way 3)Test it with different certficates (UEKAE ex) -4)Make some optimizaitons in hashing and chain creating. \ No newline at end of file +4)Make some optimizaitons in hashing and chain creating. +5)Try to integrate it with pisi (test one) \ No newline at end of file From uludag-commits at pardus.org.tr Wed Dec 5 12:05:21 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 12:05:21 +0200 (EET) Subject: [Uludag-commits] r16242 - trunk/tasma/package-manager/src Message-ID: <20071205100521.166E5864256@liste.uludag.org.tr> Author: gokcen.eraslan Date: Wed Dec 5 12:05:20 2007 New Revision: 16242 Added: trunk/tasma/package-manager/src/SpecialList.py Modified: trunk/tasma/package-manager/src/BasketDialog.py trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/HelpDialog.py trunk/tasma/package-manager/src/MainWidget.py Log: pisi-db conflict fix, KDialogs and some comments Modified: trunk/tasma/package-manager/src/BasketDialog.py ================================================================= --- trunk/tasma/package-manager/src/BasketDialog.py (original) +++ trunk/tasma/package-manager/src/BasketDialog.py Wed Dec 5 12:05:20 2007 @@ -15,6 +15,7 @@ from sets import Set as set from qt import * from kdecore import * +from kdeui import KCursor from khtml import * import pisi @@ -45,9 +46,9 @@ except Exception, e: print e -class BasketDialog(QDialog): +class BasketDialog(KDialog): def __init__(self, parent, basket): - QDialog.__init__(self,parent,str(i18n("Basket")),True) + KDialog.__init__(self,parent,str(i18n("Basket")),True) self.parent = parent self.basket = basket self.totalSize = 0 @@ -133,9 +134,9 @@ node.addEventListener(DOM.DOMString("click"),self.eventListener,True) def updateTotals(self): - self.setCursor(Qt.waitCursor) + self.setCursor(KCursor.waitCursor) self.createExtraPackagesList() - self.setCursor(Qt.arrowCursor) + self.setCursor(KCursor.arrowCursor) def createSelectedPackagesList(self): self.createHTML(self.basket.packages, self.pkgHtmlPart, True) Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Wed Dec 5 12:05:20 2007 @@ -170,7 +170,7 @@ self.comar.cancel() def checkConflicts(self, packages): - return pisi.api.generate_conflicts(packages) + return pisi.api.get_conflicts(packages) def inProgress(self): return self.comar.com_lock.locked() Modified: trunk/tasma/package-manager/src/HelpDialog.py ================================================================= --- trunk/tasma/package-manager/src/HelpDialog.py (original) +++ trunk/tasma/package-manager/src/HelpDialog.py Wed Dec 5 12:05:20 2007 @@ -22,9 +22,9 @@ PREFERENCES:"preferences_help.html" } -class HelpDialog(QDialog): +class HelpDialog(KDialog): def __init__(self, parent, help): - QDialog.__init__(self, parent) + KDialog.__init__(self, parent) self.setCaption(i18n("Package Manager Help")) self.layout = QGridLayout(self) self.htmlPart = KHTMLPart(self) Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Wed Dec 5 12:05:20 2007 @@ -139,14 +139,13 @@ self.settings = Settings.Settings(kapp.config()) - #self.lazyLoadComponentList() - def lazyLoadComponentList(self): self.parent.tray.updateTrayIcon() if self.componentsReady(): self.installState() + #TODO: Fix this #global packageToInstall #if packageToInstall: # self.installPackage(unicode(packageToInstall)) @@ -182,18 +181,33 @@ self.parent.showUpgradeAction.setChecked(False) def installState(self, reset=True): + # set mouse to waiting icon kapp.setOverrideCursor(KCursor.waitCursor) + + # uncheck buttons, clear search line, empty cache if reset: self.resetState() + + # check the "Show New Packages" button self.parent.showNewAction.setChecked(True) self.processEvents() + + # ask pisi to get available packages packages = self.command.listNewPackages() + self.state = install_state + + # prepare components' listview on the left side self.createComponentList(packages) + self.operateAction.setText(i18n("Install Package(s)")) self.operateAction.setIconSet(loadIconSet("ok")) self.basket.setState(self.state) + + # set last selected component and so, trigger HTML creator to create right side (packages) + # (selects first component if it is the first time) self.setLastSelected() + self.updateStatusBar() kapp.restoreOverrideCursor() From uludag-commits at pardus.org.tr Wed Dec 5 12:05:22 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 12:05:22 +0200 (EET) Subject: [Uludag-commits] r16243 - trunk/tasma/package-manager/src Message-ID: <20071205100522.A11E97C005E@liste.uludag.org.tr> Author: gokcen.eraslan Date: Wed Dec 5 12:05:22 2007 New Revision: 16243 Modified: trunk/tasma/package-manager/src/PreferencesDialog.ui trunk/tasma/package-manager/src/ProgressDialog.ui trunk/tasma/package-manager/src/RepoDialog.ui Log: switch dialogs to KDialog Modified: trunk/tasma/package-manager/src/PreferencesDialog.ui ================================================================= --- trunk/tasma/package-manager/src/PreferencesDialog.ui (original) +++ trunk/tasma/package-manager/src/PreferencesDialog.ui Wed Dec 5 12:05:22 2007 @@ -1,6 +1,6 @@ PreferencesDialog - + PreferencesDialog Modified: trunk/tasma/package-manager/src/ProgressDialog.ui ================================================================= --- trunk/tasma/package-manager/src/ProgressDialog.ui (original) +++ trunk/tasma/package-manager/src/ProgressDialog.ui Wed Dec 5 12:05:22 2007 @@ -1,6 +1,6 @@ ProgressDialog - + ProgressDialog Modified: trunk/tasma/package-manager/src/RepoDialog.ui ================================================================= --- trunk/tasma/package-manager/src/RepoDialog.ui (original) +++ trunk/tasma/package-manager/src/RepoDialog.ui Wed Dec 5 12:05:22 2007 @@ -1,6 +1,6 @@ RepoDialog - + RepoDialog From uludag-commits at pardus.org.tr Wed Dec 5 12:05:24 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 12:05:24 +0200 (EET) Subject: [Uludag-commits] r16244 - trunk/tasma/package-manager/src Message-ID: <20071205100524.8B9967C005E@liste.uludag.org.tr> Author: gokcen.eraslan Date: Wed Dec 5 12:05:24 2007 New Revision: 16244 Added: trunk/tasma/package-manager/src/Globals.py Modified: trunk/tasma/package-manager/src/BasketDialog.py trunk/tasma/package-manager/src/CustomEventListener.py trunk/tasma/package-manager/src/HelpDialog.py trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/SpecialList.py trunk/tasma/package-manager/src/package-manager.py Log: Globals and SpecialList module created Globals module is responsible from operations requires KApplication. SpecialList module is a new form of KHTMLPart used as a listview like widget on the right side of the package manager. Modified: trunk/tasma/package-manager/src/BasketDialog.py ================================================================= --- trunk/tasma/package-manager/src/BasketDialog.py (original) +++ trunk/tasma/package-manager/src/BasketDialog.py Wed Dec 5 12:05:24 2007 @@ -15,7 +15,7 @@ from sets import Set as set from qt import * from kdecore import * -from kdeui import KCursor +from kdeui import KCursor, KDialog from khtml import * import pisi Modified: trunk/tasma/package-manager/src/CustomEventListener.py ================================================================= --- trunk/tasma/package-manager/src/CustomEventListener.py (original) +++ trunk/tasma/package-manager/src/CustomEventListener.py Wed Dec 5 12:05:24 2007 @@ -22,6 +22,7 @@ def handleEvent(self,event): target = event.target().nodeName().string() try: + #if checkbox is clicked, add/remove package to/from basket if target == "INPUT": inputElement = DOM.HTMLInputElement(event.target()) name = inputElement.name().string() Modified: trunk/tasma/package-manager/src/HelpDialog.py ================================================================= --- trunk/tasma/package-manager/src/HelpDialog.py (original) +++ trunk/tasma/package-manager/src/HelpDialog.py Wed Dec 5 12:05:24 2007 @@ -13,6 +13,7 @@ from qt import * from kdecore import locate, i18n, KURL from khtml import KHTMLPart +from kdeui import KDialog from LocaleData import getKDELocale (MAINAPP, PREFERENCES) = (1, 2) Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: trunk/tasma/package-manager/src/SpecialList.py ================================================================= --- trunk/tasma/package-manager/src/SpecialList.py (original) +++ trunk/tasma/package-manager/src/SpecialList.py Wed Dec 5 12:05:24 2007 @@ -1,4 +1,174 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +#qt import +from qt import * + +#kde imports +from kdecore import * +from kdeui import * +from khtml import * + +import pisi +import re + +import Globals +import CustomEventListener + +class SpecialList: + def __init__(self, parent): + self.parent = parent + self.part = KHTMLPart(self.parent) + self.part.view().setFocus() + + # Read javascript + js = file(str(locate("data","package-manager/animation.js"))).read() + js = re.sub("#3cBB39", KGlobalSettings.alternateBackgroundColor().name(), js) + js = re.sub("#3c8839", KGlobalSettings.baseColor().name(), js) + self.javascript = re.sub("#533359",KGlobalSettings.highlightColor().name(), js) + + # Read Css + cssFile = file(str(locate("data","package-manager/layout.css"))).read() + self.css = cssFile + + QObject.connect(self.part, SIGNAL("completed()"), self.registerEventListener) + + def registerEventListener(self): + self.eventListener = CustomEventListener.CustomEventListener(self) + node = self.part.document().getElementsByTagName(DOM.DOMString("body")).item(0) + node.addEventListener(DOM.DOMString("click"),self.eventListener,True) + + def clear(self): + self.part.view().setContentsPos(0, 0) + self.part.begin() + self.part.write(''' + + + + + + ''') + self.part.end() + + def createList(self,packages,part=None): + head = ''' + + + + ''' + + if not part: + part = self.part + + Globals.setWaitCursor() + part.view().setContentsPos(0, 0) + part.begin() + part.write(head) + part.write("" % self.css) + part.write("" % self.javascript) + part.write("") + + if set(packages) - set(self.basket.packages): + part.write(''''''+i18n("Select all packages in this category")+'''''') + else: + part.write(''''''+i18n("Reverse package selections")+'''''') + + part.write(self.createListForPackages(packages)) + part.end() + Globals.setNormalCursor() + + def createListForPackages(self,packages): + result = "" + template =''' + +

+ %s +
+ + %s
%s
+
+
+
+

%s + %s
+ %s%s
%s%s
%s%s
%s%s +

+
+
+
+ + ''' + + index = 0 + titleStyle = "" + style = "" + packages.sort(key=string.lower) + pdb = pisi.db.packagedb.PackageDB() + + alternativeColor = KGlobalSettings.alternateBackgroundColor().name() + baseColor = KGlobalSettings.baseColor().name() + + for app in packages: + if index % 2 == 0: + style = "background-color:%s" % alternativeColor + else: + style = "background-color:%s" % baseColor + titleStyle = style + + size = 0L + if self.state == remove_state: + # first try to locate package information from repository databases + try: + package, repo = pdb.get_package_repo(app) + #TODO: Handle "Repo item not found" type of exceptions only + except: + # if it fails use provided information directly + #package = pdb.get_package(app, pisi.itembyrepodb.installed) + package = pisi.db.installdb.InstallDB().get_package(app) + repo = i18n("N\A") + size = package.installedSize + else: + package, repo = pdb.get_package_repo(app) + size = package.packageSize + + desc = package.description + summary = package.summary + version = package.version + iconPath = getIconPath(package.icon) + + if package.source: + homepage = package.source.homepage + else: + homepage = i18n("N\A") + + if size: + tpl = pisi.util.human_readable_size(size) + size = "%.0f %s" % (tpl[0], tpl[1]) + else: + size = i18n("N\A") + + if app in self.basket.packages: + titleStyle = "background-color:#678DB2" + checkState = "checked" + else: + checkState = "" + + curindex = index + 1 + if self.state == remove_state and app in unremovable_packages: + checkbox = """
""" % (titleStyle,curindex,checkState,app,curindex) + else: + checkbox = """
""" % (titleStyle,curindex,checkState,app,curindex) + + iconSize = getIconSize() + result += template % (checkbox, titleStyle,curindex,iconPath,iconSize,iconSize,app,summary,style,curindex,curindex, + i18n("Description: "), desc, + i18n("Version: "), version, + i18n("Repository: "), repo, + i18n("Package Size: "), size, + i18n("Homepage: "), homepage,homepage) + index += 1 + + return result Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Wed Dec 5 12:05:24 2007 @@ -19,9 +19,10 @@ from kdeui import * from kio import * import kdedesigner -import PmDcop # Local imports +import PmDcop +import Globals from MainWidget import * import Settings @@ -57,7 +58,7 @@ self.aboutus = KAboutApplication(self) self.helpWidget = None - self.mainwidget = MainApplicationWidget(self, application=kapp) + self.mainwidget = MainApplicationWidget(self) self.setCentralWidget(self.mainwidget) self.setupMenu() @@ -146,6 +147,9 @@ kapp = KUniqueApplication(True, True, True) + # pass reference to Globals module, so KApplication can be reached when needed + Globals.init(kapp) + args = KCmdLineArgs.parsedArgs() if args.isSet("install"): packageToInstall = args.getOption("install") From uludag-commits at pardus.org.tr Wed Dec 5 14:42:23 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 14:42:23 +0200 (EET) Subject: [Uludag-commits] r16245 - in branches: yali-qt4 yali4 Message-ID: <20071205124223.3D4F47C008D@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 14:42:22 2007 New Revision: 16245 Added: branches/yali-qt4/ - copied from r16244, branches/yali4/ Removed: branches/yali4/ Log: rename the base From uludag-commits at pardus.org.tr Wed Dec 5 14:43:26 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 14:43:26 +0200 (EET) Subject: [Uludag-commits] r16246 - branches/yali4 Message-ID: <20071205124326.A49307C008D@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 14:43:26 2007 New Revision: 16246 Added: branches/yali4/ - copied from r16244, trunk/yali/ Log: merge the current yali From uludag-commits at pardus.org.tr Wed Dec 5 14:51:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 14:51:34 +0200 (EET) Subject: [Uludag-commits] r16247 - in branches/yali4: . yali yali4 Message-ID: <20071205125134.B31207C009E@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 14:51:34 2007 New Revision: 16247 Added: branches/yali4/yali4/ - copied from r16246, branches/yali4/yali/ Removed: branches/yali4/yali/ Modified: branches/yali4/yali-bin Log: rename to yali4 Modified: branches/yali4/yali-bin ================================================================= --- branches/yali4/yali-bin (original) +++ branches/yali4/yali-bin Wed Dec 5 14:51:34 2007 @@ -12,17 +12,17 @@ # import locale -import yali -import yali.sysutils -from yali.constants import consts +import yali4 +import yali4.sysutils +from yali4.constants import consts def try_umount_target(): for mpoint in ("/home", "/dev", "/proc", "/sys", ""): - yali.sysutils.umount(consts.target_dir + mpoint) + yali4.sysutils.umount(consts.target_dir + mpoint) def main(): try_umount_target() - runner = yali.default_runner() + runner = yali4.default_runner() runner.run() if __name__ == "__main__": From uludag-commits at pardus.org.tr Wed Dec 5 14:56:26 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 14:56:26 +0200 (EET) Subject: [Uludag-commits] r16248 - in branches/yali4: . yali4 Message-ID: <20071205125626.9E1977C009E@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 14:56:26 2007 New Revision: 16248 Modified: branches/yali4/setup.py branches/yali4/yali4/__init__.py Log: yali4 yihoha Modified: branches/yali4/setup.py ================================================================= --- branches/yali4/setup.py (original) +++ branches/yali4/setup.py Wed Dec 5 14:56:26 2007 @@ -22,28 +22,28 @@ from distutils.command.install import install from distutils.spawn import find_executable, spawn -import yali +import yali4 -YALI_VERSION = yali.__version__ +YALI_VERSION = yali4.__version__ def qt_ui_files(): - p = "yali/gui/Ui/*.ui" + p = "yali4/gui/Ui/*.ui" return glob.glob(p) def gui_pics(): - p = "yali/gui/pics" + p = "yali4/gui/pics" return glob.glob(p + "/*.png") def gui_slidepics(): - p = "yali/gui/pics/slideshow/*.png" + p = "yali4/gui/pics/slideshow/*.png" return glob.glob(p) def user_faces(): - p = "yali/user_faces/*.png" + p = "yali4/user_faces/*.png" return glob.glob(p) def data_files(): - p = "yali/data/*.xml" + p = "yali4/data/*.xml" return glob.glob(p) def getRevision(): @@ -76,7 +76,7 @@ py_file = py_file_name(ui_file) # lines in reverse order lines = ["_ = __trans.ugettext", - "__trans = gettext.translation('yali', fallback=True)\n", + "__trans = gettext.translation('yali4', fallback=True)\n", "import gettext\n"] f = open(py_file, "r").readlines() for l in lines: @@ -88,10 +88,10 @@ def compile_ui(self, ui_file): pyqt_configuration = pyqtconfig.Configuration() - pyuic_exe = find_executable('pyuic', pyqt_configuration.default_bin_dir) + pyuic_exe = find_executable('pyuic4', pyqt_configuration.default_bin_dir) if not pyuic_exe: # Search on the $Path. - pyuic_exe = find_executable('pyuic') + pyuic_exe = find_executable('pyuic4') cmd = [pyuic_exe, ui_file, '-o'] cmd.append(py_file_name(ui_file)) @@ -129,12 +129,12 @@ pass def run(self): - yali_dir = os.path.join(get_python_lib(), "yali") + yali_dir = os.path.join(get_python_lib(), "yali4") if os.path.exists(yali_dir): print "removing: ", yali_dir shutil.rmtree(yali_dir) - data_dir = "/usr/share/yali" + data_dir = "/usr/share/yali4" if os.path.exists(data_dir): print "removing: ", data_dir shutil.rmtree(data_dir) @@ -164,7 +164,7 @@ pass shutil.copy("po/%s.mo" % lang, os.path.join(destpath, "%s.mo" % i18n_domain)) -setup(name="yali", +setup(name="yali4", version= getVersion(), description="YALI (Yet Another Linux Installer)", long_description="Pardus System Installer.", @@ -172,15 +172,15 @@ author="Pardus Developers", author_email="yali at pardus.org.tr", url="http://www.pardus.org.tr/eng/yali/", - packages = ['yali', 'yali.gui', 'yali.gui.Ui'], + packages = ['yali4', 'yali4.gui', 'yali4.gui.Ui'], package_dir = {'': ''}, - data_files = [('/usr/share/yali/pics', gui_pics()), - ('/usr/share/yali/slideshow', gui_slidepics()), - ('/usr/share/yali/user_faces', user_faces()), - ('/usr/share/yali/data', data_files())], - scripts = ['yali-bin'], - ext_modules = [Extension('yali._sysutils', - sources = ['yali/_sysutils.c'], + data_files = [('/usr/share/yali4/pics', gui_pics()), + ('/usr/share/yali4/slideshow', gui_slidepics()), + ('/usr/share/yali4/user_faces', user_faces()), + ('/usr/share/yali4/data', data_files())], + scripts = ['yali4-bin'], + ext_modules = [Extension('yali4._sysutils', + sources = ['yali4/_sysutils.c'], libraries = ["ext2fs"], extra_compile_args = ['-Wall'])], cmdclass = { Modified: branches/yali4/yali4/__init__.py ================================================================= --- branches/yali4/yali4/__init__.py (original) +++ branches/yali4/yali4/__init__.py Wed Dec 5 14:56:26 2007 @@ -10,7 +10,7 @@ # Please read the COPYING file. # -__version__ = "1.1.7" +__version__ = "2.0" import sys import exceptions @@ -18,18 +18,18 @@ import cStringIO import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext import pisi -from yali.exception import * +from yali4.exception import * def default_runner(): - import yali.gui.runner + import yali4.gui.runner sys.excepthook = exception_handler - return yali.gui.runner.Runner() + return yali4.gui.runner.Runner() exception_normal, exception_fatal, \ exception_pisi, exception_informational, \ @@ -68,5 +68,5 @@ sio.seek(0) - import yali.gui.runner - yali.gui.runner.showException(exception_type, unicode(sio.read())) + import yali4.gui.runner + yali4.gui.runner.showException(exception_type, unicode(sio.read())) From uludag-commits at pardus.org.tr Wed Dec 5 14:56:55 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 14:56:55 +0200 (EET) Subject: [Uludag-commits] r16249 - branches/yali4 Message-ID: <20071205125655.F1C977C009E@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 14:56:55 2007 New Revision: 16249 Added: branches/yali4/yali4-bin - copied unchanged from r16247, branches/yali4/yali-bin Removed: branches/yali4/yali-bin Log: rename From uludag-commits at pardus.org.tr Wed Dec 5 16:19:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 5 Dec 2007 16:19:31 +0200 (EET) Subject: [Uludag-commits] r16250 - in branches/yali4: . po tools yali4 Message-ID: <20071205141931.62E938643A1@liste.uludag.org.tr> Author: gokmen.goksel Date: Wed Dec 5 16:19:30 2007 New Revision: 16250 Added: branches/yali4/po/yali4.pot - copied unchanged from r16246, branches/yali4/po/yali.pot Removed: branches/yali4/po/yali.pot Modified: branches/yali4/MANIFEST.in branches/yali4/README branches/yali4/README-TRANSLATORS branches/yali4/setup.py branches/yali4/tools/show_screen.py branches/yali4/tools/update-po.sh branches/yali4/yali4/bootloader.py branches/yali4/yali4/constants.py branches/yali4/yali4/filesystem.py branches/yali4/yali4/fstab.py branches/yali4/yali4/kahya.py branches/yali4/yali4/localedata.py branches/yali4/yali4/localeutils.py branches/yali4/yali4/partition.py branches/yali4/yali4/partitionrequest.py branches/yali4/yali4/partitiontype.py branches/yali4/yali4/pisiiface.py branches/yali4/yali4/postinstall.py branches/yali4/yali4/steps.py branches/yali4/yali4/storage.py branches/yali4/yali4/sysutils.py branches/yali4/yali4/users.py Log: Another like an arm commit.. Modified: branches/yali4/MANIFEST.in ================================================================= --- branches/yali4/MANIFEST.in (original) +++ branches/yali4/MANIFEST.in Wed Dec 5 16:19:30 2007 @@ -1,7 +1,7 @@ recursive-include po * -recursive-include yali/user_faces * -recursive-include yali/gui/pics * -recursive-include yali/gui/slideshow * -recursive-include yali/gui *.ui +recursive-include yali4/user_faces * +recursive-include yali4/gui/pics * +recursive-include yali4/gui/slideshow * +recursive-include yali4/gui *.ui include . AUTHORS COPYING Modified: branches/yali4/README ================================================================= --- branches/yali4/README (original) +++ branches/yali4/README Wed Dec 5 16:19:30 2007 @@ -1,3 +1,6 @@ +This is a development version of YALI which is porting to Qt4, one can +use current YALI (Qt3) from uludag/trunk/yali in svn. + YALI is Yet Another Linux Installer. It is the installer that sets up the system by installing packages from the installation media (eg. CD, network, Internet) and carrying out the basic configuration. YALI is Modified: branches/yali4/README-TRANSLATORS ================================================================= --- branches/yali4/README-TRANSLATORS (original) +++ branches/yali4/README-TRANSLATORS Wed Dec 5 16:19:30 2007 @@ -9,9 +9,9 @@ 2. Checkout the latest code of YALI from SVN: -svn co https://svn.pardus.org.tr/uludag/trunk/yali/ +svn co https://svn.pardus.org.tr/uludag/branches/yali4/ -3. Go to the top directory (i.e cd yali) +3. Go to the top directory (i.e cd yali4) 4. Execute the following: python tools/show_screen.py [MODULENAME] Modified: branches/yali4/setup.py ================================================================= --- branches/yali4/setup.py (original) +++ branches/yali4/setup.py Wed Dec 5 16:19:30 2007 @@ -139,7 +139,7 @@ print "removing: ", data_dir shutil.rmtree(data_dir) -i18n_domain = "yali" +i18n_domain = "yali4" i18n_languages = ["tr", "nl", "it", Modified: branches/yali4/tools/show_screen.py ================================================================= --- branches/yali4/tools/show_screen.py (original) +++ branches/yali4/tools/show_screen.py Wed Dec 5 16:19:30 2007 @@ -1,8 +1,8 @@ #!/usr/bin/python import sys -sys.path.append("./yali/gui") -sys.path.append("../yali/gui") +sys.path.append("./yali4/gui") +sys.path.append("../yali4/gui") from qt import * Modified: branches/yali4/tools/update-po.sh ================================================================= --- branches/yali4/tools/update-po.sh (original) +++ branches/yali4/tools/update-po.sh Wed Dec 5 16:19:30 2007 @@ -4,9 +4,9 @@ set -x -xgettext -L "python" -k__tr -k_ yali/gui/Ui/*.py yali/gui/*.py yali/*.py -o po/yali.pot +xgettext -L "python" -k__tr -k_ yali4/gui/Ui/*.py yali4/gui/*.py yali4/*.py -o po/yali4.pot for lang in $LANGUAGES do - msgmerge -U $lang po/yali.pot + msgmerge -U $lang po/yali4.pot done Modified: branches/yali4/yali4/bootloader.py ================================================================= --- branches/yali4/yali4/bootloader.py (original) +++ branches/yali4/yali4/bootloader.py Wed Dec 5 16:19:30 2007 @@ -14,16 +14,16 @@ import glob import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext -from yali.exception import * -from yali.constants import consts -import yali.sysutils -import yali.partitiontype as parttype -import yali.partitionrequest as request -from yali.partitionrequest import partrequests -import yali.gui.context as ctx +from yali4.exception import * +from yali4.constants import consts +import yali4.sysutils +import yali4.partitiontype as parttype +import yali4.partitionrequest as request +from yali4.partitionrequest import partrequests +import yali4.gui.context as ctx grub_conf_tmp = """\ default 0 @@ -185,7 +185,7 @@ if not grub_install_root.startswith("/dev/"): grub_install_root = "/dev/%s" % grub_install_root - cmd = "%s --root-directory=%s %s" % (yali.sysutils.find_executable("grub-install"), + cmd = "%s --root-directory=%s %s" % (yali4.sysutils.find_executable("grub-install"), consts.target_dir, grub_install_root) if os.system(cmd) != 0: Modified: branches/yali4/yali4/constants.py ================================================================= --- branches/yali4/yali4/constants.py (original) +++ branches/yali4/yali4/constants.py Wed Dec 5 16:19:30 2007 @@ -50,7 +50,7 @@ consts.pardus_version = file("/etc/pardus-release").readlines()[0].strip() -consts.data_dir = "/usr/share/yali" +consts.data_dir = "/usr/share/yali4" consts.mnt_dir = "/mnt" Modified: branches/yali4/yali4/filesystem.py ================================================================= --- branches/yali4/yali4/filesystem.py (original) +++ branches/yali4/yali4/filesystem.py Wed Dec 5 16:19:30 2007 @@ -22,10 +22,10 @@ import parted import math -from yali.exception import * -import yali.sysutils as sysutils -import yali.parteddata as parteddata -import yali.storage +from yali4.exception import * +import yali4.sysutils as sysutils +import yali4.parteddata as parteddata +import yali4.storage class FSError(YaliError): pass @@ -104,10 +104,10 @@ ## # check label for existence. def labelExists(self, label): - if not yali.storage.devices: - yali.storage.init_devices() + if not yali4.storage.devices: + yali4.storage.init_devices() - for dev in yali.storage.devices: + for dev in yali4.storage.devices: for part in dev.getPartitions(): if label == part.getFSLabel(): return True Modified: branches/yali4/yali4/fstab.py ================================================================= --- branches/yali4/yali4/fstab.py (original) +++ branches/yali4/yali4/fstab.py Wed Dec 5 16:19:30 2007 @@ -12,7 +12,7 @@ from os.path import join -from yali.constants import consts +from yali4.constants import consts class FstabEntry: def __init__(self, dev, mp, fs, opts, d="0", p="0"): Modified: branches/yali4/yali4/kahya.py ================================================================= --- branches/yali4/yali4/kahya.py (original) +++ branches/yali4/yali4/kahya.py Wed Dec 5 16:19:30 2007 @@ -3,9 +3,9 @@ import re import sys -import yali.yalireadpiks as yaliReadPiks -from yali.localedata import * -from yali.users import * +import yali4.yalireadpiks as yaliReadPiks +from yali4.localedata import * +from yali4.users import * class userErrors: def __init__(self): Modified: branches/yali4/yali4/localedata.py ================================================================= --- branches/yali4/yali4/localedata.py (original) +++ branches/yali4/yali4/localedata.py Wed Dec 5 16:19:30 2007 @@ -11,7 +11,7 @@ # import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext Modified: branches/yali4/yali4/localeutils.py ================================================================= --- branches/yali4/yali4/localeutils.py (original) +++ branches/yali4/yali4/localeutils.py Wed Dec 5 16:19:30 2007 @@ -12,18 +12,18 @@ import os import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext -import yali.localedata -from yali.constants import consts +import yali4.localedata +from yali4.constants import consts def write_locale_from_cmdline(): locale_file_path = os.path.join(consts.target_dir, "etc/env.d/03locale") f = open(locale_file_path, "w") - f.write("LANG=%s\n" % yali.localedata.locales[consts.lang]["locale"]) - f.write("LC_ALL=%s\n" % yali.localedata.locales[consts.lang]["locale"]) + f.write("LANG=%s\n" % yali4.localedata.locales[consts.lang]["locale"]) + f.write("LC_ALL=%s\n" % yali4.localedata.locales[consts.lang]["locale"]) def set_keymap(keymap): os.system("setxkbmap -layout %s" % keymap) Modified: branches/yali4/yali4/partition.py ================================================================= --- branches/yali4/yali4/partition.py (original) +++ branches/yali4/yali4/partition.py Wed Dec 5 16:19:30 2007 @@ -13,12 +13,12 @@ import os import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext import parted -import yali.parteddata as parteddata -import yali.filesystem +import yali4.parteddata as parteddata +import yali4.filesystem ## @@ -44,7 +44,7 @@ return self._fs_ready def setFileSystemType(self, fs_type): - if isinstance(fs_type, yali.filesystem.FileSystem): + if isinstance(fs_type, yali4.filesystem.FileSystem): fs_type = fs_type.getFSType() self._partition.set_system(fs_type) @@ -129,7 +129,7 @@ return self._fsname def getFSLabel(self): - fs = yali.filesystem.get_filesystem(self.getFSName()) + fs = yali4.filesystem.get_filesystem(self.getFSName()) try: return fs.getLabel(self) except AttributeError, e: Modified: branches/yali4/yali4/partitionrequest.py ================================================================= --- branches/yali4/yali4/partitionrequest.py (original) +++ branches/yali4/yali4/partitionrequest.py Wed Dec 5 16:19:30 2007 @@ -14,10 +14,10 @@ import os -from yali.exception import * -from yali.constants import consts -import yali.partitiontype as parttype -import yali.sysutils +from yali4.exception import * +from yali4.constants import consts +import yali4.partitiontype as parttype +import yali4.sysutils class RequestException(YaliException): pass @@ -43,8 +43,8 @@ r.applyRequest() # we need to trigger udev for our new labels - yali.sysutils.run("/sbin/udevtrigger") - yali.sysutils.run("/sbin/udevsettle", "--timeout=180") + yali4.sysutils.run("/sbin/udevtrigger") + yali4.sysutils.run("/sbin/udevsettle", "--timeout=180") # then mount request @@ -327,7 +327,7 @@ if not os.path.isdir(target): os.mkdir(target) - yali.sysutils.mount(source, target, filesystem) + yali4.sysutils.mount(source, target, filesystem) mtab_entry = "%s %s %s rw 0 0\n" % (source, target, @@ -355,10 +355,10 @@ def applyRequest(self): # see #832 - if yali.sysutils.mem_total() > 512: - yali.sysutils.swap_as_file(consts.swap_file_path, 300) + if yali4.sysutils.mem_total() > 512: + yali4.sysutils.swap_as_file(consts.swap_file_path, 300) else: - yali.sysutils.swap_as_file(consts.swap_file_path, 600) + yali4.sysutils.swap_as_file(consts.swap_file_path, 600) PartRequest.applyRequest(self) Modified: branches/yali4/yali4/partitiontype.py ================================================================= --- branches/yali4/yali4/partitiontype.py (original) +++ branches/yali4/yali4/partitiontype.py Wed Dec 5 16:19:30 2007 @@ -15,10 +15,10 @@ import parted import gettext -__trans = gettext.translation('yali', fallback=True) +__trans = gettext.translation('yali4', fallback=True) _ = __trans.ugettext -import yali.filesystem +import yali4.filesystem class PartitionType: @@ -38,11 +38,11 @@ # check cmdline for reiserfs support cmdline = open("/proc/cmdline", "r").read() if cmdline.find("enable_reiserfs") >= 0: - self.filesystem = yali.filesystem.ReiserFileSystem() + self.filesystem = yali4.filesystem.ReiserFileSystem() elif cmdline.find("enable_xfs") >= 0: - self.filesystem = yali.filesystem.XFSFileSystem() + self.filesystem = yali4.filesystem.XFSFileSystem() else: - self.filesystem = yali.filesystem.Ext3FileSystem() + self.filesystem = yali4.filesystem.Ext3FileSystem() class RootPartitionType(__PartitionType): @@ -65,7 +65,7 @@ class SwapPartitionType(PartitionType): name = _("Swap") - filesystem = yali.filesystem.SwapFileSystem() + filesystem = yali4.filesystem.SwapFileSystem() mountpoint = None mountoptions = "sw" parted_type = parted.PARTITION_PRIMARY Modified: branches/yali4/yali4/pisiiface.py ================================================================= --- branches/yali4/yali4/pisiiface.py (original) +++ branches/yali4/yali4/pisiiface.py Wed Dec 5 16:19:30 2007 @@ -22,8 +22,8 @@ import pisi.util import pisi.context as ctx -import yali.postinstall -from yali.constants import consts +import yali4.postinstall +from yali4.constants import consts def initialize(ui, with_comar=False): Modified: branches/yali4/yali4/postinstall.py ================================================================= --- branches/yali4/yali4/postinstall.py (original) +++ branches/yali4/yali4/postinstall.py Wed Dec 5 16:19:30 2007 @@ -14,7 +14,7 @@ import shutil import grp -from yali.constants import consts +from yali4.constants import consts # necessary things after a full install Modified: branches/yali4/yali4/steps.py ================================================================= --- branches/yali4/yali4/steps.py (original) +++ branches/yali4/yali4/steps.py Wed Dec 5 16:19:30 2007 @@ -17,7 +17,7 @@ # 'preparation before install', 'system installation' and 'basic # setup'. Each stage can have different number of screens though... -from yali.exception import YaliError, YaliException +from yali4.exception import YaliError, YaliException class Steps: Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Wed Dec 5 16:19:30 2007 @@ -26,11 +26,11 @@ import struct import binascii -from yali.parteddata import * -from yali.partition import Partition, FreeSpace -from yali.exception import YaliError, YaliException -import yali.sysutils as sysutils -import yali.filesystem +from yali4.parteddata import * +from yali4.partition import Partition, FreeSpace +from yali4.exception import YaliError, YaliException +import yali4.sysutils as sysutils +import yali4.filesystem class DeviceError(YaliError): pass @@ -344,9 +344,9 @@ if isinstance(fs, str): # a string... get the corresponding FileSystem object - fs = yali.filesystem.get_filesystem(fs) + fs = yali4.filesystem.get_filesystem(fs) - if isinstance(fs, yali.filesystem.FileSystem): + if isinstance(fs, yali4.filesystem.FileSystem): fs = fs.getFSType() else: fs = None @@ -420,9 +420,9 @@ if isinstance(fs, str): # a string... get the corresponding FileSystem object - fs = yali.filesystem.get_filesystem(fs) + fs = yali4.filesystem.get_filesystem(fs) - if not isinstance(fs, yali.filesystem.FileSystem): + if not isinstance(fs, yali4.filesystem.FileSystem): raise DeviceError, "filesystem is None, can't resize" print dir(fs) Modified: branches/yali4/yali4/sysutils.py ================================================================= --- branches/yali4/yali4/sysutils.py (original) +++ branches/yali4/yali4/sysutils.py Wed Dec 5 16:19:30 2007 @@ -18,8 +18,8 @@ from pardus.sysutils import find_executable from pardus.procutils import run -from yali._sysutils import * -from yali.constants import consts +from yali4._sysutils import * +from yali4.constants import consts ## # run comar daemon in chroot Modified: branches/yali4/yali4/users.py ================================================================= --- branches/yali4/yali4/users.py (original) +++ branches/yali4/yali4/users.py Wed Dec 5 16:19:30 2007 @@ -18,7 +18,7 @@ import os from string import ascii_letters, digits -from yali.constants import consts +from yali4.constants import consts # a set of User instances waiting... # we'll add these users at the last step of the installation. From uludag-commits at pardus.org.tr Thu Dec 6 10:34:01 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 6 Dec 2007 10:34:01 +0200 (EET) Subject: [Uludag-commits] r16251 - trunk/tasma/disk-manager/src Message-ID: <20071206083401.B25007C008D@liste.uludag.org.tr> Author: gokcen.eraslan Date: Thu Dec 6 10:34:01 2007 New Revision: 16251 Modified: trunk/tasma/disk-manager/src/disk-manager.py Log: qmessagebox2kmessagebox Modified: trunk/tasma/disk-manager/src/disk-manager.py ================================================================= --- trunk/tasma/disk-manager/src/disk-manager.py (original) +++ trunk/tasma/disk-manager/src/disk-manager.py Thu Dec 6 10:34:01 2007 @@ -119,7 +119,7 @@ # Check users group if s/he not in disk group if not os.getgroups().__contains__(grp.getgrnam("disk")[2]): - QMessageBox(i18n("Error"),i18n("User not in disk group !"),QMessageBox.Warning,QMessageBox.Ok,0,0,self).exec_loop() + KMessageBox.sorry(self,i18n("User not in disk group !"), i18n("Error")) self.disableAll() else: try: @@ -132,8 +132,7 @@ except: self.label_warn.setText(i18n("File /etc/fstab is not correct, please fix it manually.")) self.label_warn.show() - QMessageBox(i18n("Error"),i18n("File /etc/fstab is not correct, please fix it manually."), - QMessageBox.Warning,QMessageBox.Ok,0,0,self).exec_loop() + KMessageBox.sorry(self, i18n("File /etc/fstab is not correct, please fix it manually."), i18n("Error")) self.disableAll() # Connections @@ -269,10 +268,13 @@ mounteds = getMounteds() if (action=='umount' and partition['partition_name'] in mounteds) or (action=='mount' and partition['partition_name'] not in mounteds): if not runQuiet([action,partition['partition_name']])==0: - self.showInfo(i18n("Error"),i18n("%s for %s failure !!" % (action,partition['partition_name'])),QMessageBox.Warning) + self.showInfo(i18n("Error"),i18n("%s for %s failure !!" % (action,partition['partition_name'])), "warning") - def showInfo(self,title,msg,type=QMessageBox.Information): - QMessageBox(title,msg,type,QMessageBox.Ok,0,0,self).show() + def showInfo(self,title,msg,type="info"): + if type == "info": + KMessageBox.information(self, msg, title) + else: + KMessageBox.sorry(self, msg, title) def fillDiskList(self): self.frame_detail.hide() From uludag-commits at pardus.org.tr Thu Dec 6 10:37:39 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 6 Dec 2007 10:37:39 +0200 (EET) Subject: [Uludag-commits] r16252 - trunk/tasma/firewall-config/src Message-ID: <20071206083739.8BEBC7C00CE@liste.uludag.org.tr> Author: gokcen.eraslan Date: Thu Dec 6 10:37:39 2007 New Revision: 16252 Modified: trunk/tasma/firewall-config/src/firewall-config.py Log: qmessagebox2kmessagebox Modified: trunk/tasma/firewall-config/src/firewall-config.py ================================================================= --- trunk/tasma/firewall-config/src/firewall-config.py (original) +++ trunk/tasma/firewall-config/src/firewall-config.py Thu Dec 6 10:37:39 2007 @@ -124,7 +124,7 @@ if checkPortFormat(str(self.linePorts.text())): dialog.dialogRule.accept(self) else: - QMessageBox.critical(self, i18n('Error'), i18n('Invalid port range.')) + KMessageBox.sorry(self, i18n('Invalid port range.'), i18n('Error')) def exec_loop(self): if dialog.dialogRule.exec_loop(self): From uludag-commits at pardus.org.tr Thu Dec 6 11:30:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 6 Dec 2007 11:30:34 +0200 (EET) Subject: [Uludag-commits] r16253 - in branches/yali4: tools yali4/gui/Ui Message-ID: <20071206093034.E3BAB864B31@liste.uludag.org.tr> Author: gokmen.goksel Date: Thu Dec 6 11:30:34 2007 New Revision: 16253 Added: branches/yali4/tools/convert (contents, props changed) Modified: branches/yali4/yali4/gui/Ui/autopartwidget.ui branches/yali4/yali4/gui/Ui/bootloaderwidget.ui branches/yali4/yali4/gui/Ui/checkcdwidget.ui branches/yali4/yali4/gui/Ui/installwidget.ui branches/yali4/yali4/gui/Ui/keyboardwidget.ui branches/yali4/yali4/gui/Ui/kickerwidget.ui branches/yali4/yali4/gui/Ui/parteditbuttons.ui branches/yali4/yali4/gui/Ui/parteditwidget.ui branches/yali4/yali4/gui/Ui/partlistwidget.ui branches/yali4/yali4/gui/Ui/rootpasswidget.ui branches/yali4/yali4/gui/Ui/setupuserswidget.ui branches/yali4/yali4/gui/Ui/welcomewidget.ui Log: Uis for Qt4 Modified: branches/yali4/yali4/gui/Ui/autopartwidget.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/yali4/yali4/gui/Ui/bootloaderwidget.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/yali4/yali4/gui/Ui/checkcdwidget.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/yali4/yali4/gui/Ui/installwidget.ui ================================================================= --- branches/yali4/yali4/gui/Ui/installwidget.ui (original) +++ branches/yali4/yali4/gui/Ui/installwidget.ui Thu Dec 6 11:30:34 2007 @@ -1,97 +1,95 @@ - -InstallWidget - - - InstallWidget + + + + + InstallWidget + + + + 0 + 0 + 414 + 328 + - - - 0 - 0 - 414 - 328 - + + Form3 - - Form3 - - - - unnamed - - - - info - - - - 0 - 75 - - - - Installing Package: - - - WordBreak|AlignTop - + + + + + + 0 + 75 + + + + Installing Package: + + + Qt::AlignTop + + + true + - - - spacer2 - - - Horizontal - - - Expanding - - - - 21 - 20 - - + + + + + + 21 + 20 + + + + QSizePolicy::Expanding + + + Qt::Horizontal + - - - spacer1 - - - Horizontal - - - Expanding - - - - 31 - 20 - - + + + + + + 31 + 20 + + + + QSizePolicy::Expanding + + + Qt::Horizontal + - - - progress - - - - - pix - - - - 7 - 7 - 0 - 0 - - - - pix - + + + + + + + + + 7 + 7 + 0 + 0 + + + + pix + + + false + - - - - + + + + + qPixmapFromMimeSource + Modified: branches/yali4/yali4/gui/Ui/keyboardwidget.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... Modified: branches/yali4/yali4/gui/Ui/kickerwidget.ui ================================================================= --- branches/yali4/yali4/gui/Ui/kickerwidget.ui (original) +++ branches/yali4/yali4/gui/Ui/kickerwidget.ui Thu Dec 6 11:30:34 2007 @@ -1,27 +1,22 @@ - -KickerWidget - - - KickerWidget + + + + + KickerWidget + + + + 0 + 0 + 502 + 360 + - - - 0 - 0 - 502 - 360 - + + Form1 -