October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41352 - in /branches/tmp/sh/mod-ui/core/libyui/doc/examples: MenuButton1.ycp MenuButton2.ycp
by sh-sh-sh＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: sh-sh-sh Date: Wed Oct 10 21:44:12 2007 New Revision: 41352 URL: http://svn.opensuse.org/viewcvs/yast?rev=41352&view=rev Log: formatting Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton1.ycp branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton2.ycp Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton1.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton1.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton1.ycp Wed Oct 10 21:44:12 2007 @@ -1,20 +1,19 @@ +// Build a dialog with one menu button. +// Wait the user selects a menu entry, +// then close the dialog and terminate. +// +// Please note that it's pretty pointless to create menu entries without an ID: +// You'd never know what entry the user selected. { - // Build a dialog with one menu button. - // Wait the user selects a menu entry, - // then close the dialog and terminate. - - // Please note it's pretty pointless to create menu entries without an ID - - // you'd never know what entry the user selected. - UI::OpenDialog( - `MenuButton( "&Create", - [ - `item(`id(`folder), "&Folder" ), - `item(`id(`text), "&Text File" ), - `item(`id(`image), "&Image" ) - ] - ) - ); + `MenuButton( "&Create", + [ + `item(`id(`folder), "&Folder" ), + `item(`id(`text), "&Text File" ), + `item(`id(`image), "&Image" ) + ] + ) + ); any id = UI::UserInput(); UI::CloseDialog(); Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton2.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/MenuButton2.ycp Wed Oct 10 21:44:12 2007 @@ -1,24 +1,23 @@ +// Build a dialog with one menu button with a submenu. +// Wait the user selects a menu entry, +// then close the dialog and terminate. +// +// Please note that it's pretty pointless to create menu entries without an ID: +// You'd never know what entry the user selected. { - // Build a dialog with one menu button with a submenu. - // Wait the user selects a menu entry, - // then close the dialog and terminate. - - // Please note it's pretty pointless to create menu entries without an ID - - // you'd never know what entry the user selected. - - UI::OpenDialog( - `MenuButton( "&Create", - [ - `item(`id(`folder), "&Folder" ), - `menu( "&Document", - [ - `item(`id(`text), "&Text File" ), - `item(`id(`image), "&Image" ) - ] - ) - ] - ) - ); + UI::OpenDialog( + `MenuButton( "&Create", + [ + `item(`id(`folder), "&Folder" ), + `menu( "&Document", + [ + `item(`id(`text), "&Text File" ), + `item(`id(`image), "&Image" ) + ] + ) + ] + ) + ); any id = UI::UserInput(); UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41351 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGDialog.h src/YGPackageSelector.cc src/YGWidget.cc src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: rpmcruz Date: Wed Oct 10 20:55:43 2007 New Revision: 41351 URL: http://svn.opensuse.org/viewcvs/yast?rev=41351&view=rev Log: * src/YGDialog.cc: fixed bug #330777. The value we need to return from the delete-event callback (close window) is always True, because we don't want GTK destroying the window for us. We just want to let YCP know about it, and then YCP does it explicitely if and when it wants to. For the record, the abandon dialog from the package selector is working. Neat dialog btw. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGWidget.cc trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41351&r1=41350… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Oct 10 20:55:43 2007 @@ -5,6 +5,13 @@ * fixed a couple of warnings. + * src/YGDialog.cc: fixed bug #330777. The value we need to return from the + delete-event callback (close window) is always True, because we don't want + GTK destroying the window for us. We just want to let YCP know about it, + and then YCP does it explicitely if and when it wants to. + For the record, the abandon dialog from the package selector is working. Neat + dialog btw. + 2007-10-03 Boyd Timothy <btimothy(a)novell.com> * src/YGPackageSelector.cc: Use the "available" name to sort Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=41351&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Wed Oct 10 20:55:43 2007 @@ -24,7 +24,7 @@ YGWindow::~YGWindow() { IMPL - setChild (NULL); + setChild (NULL); gtk_widget_destroy (m_widget); g_object_unref (G_OBJECT (m_widget)); } @@ -108,17 +108,16 @@ YGWindow *pThis) { IMPL - return !pThis->checkDelete(); + // never let GTK+ destroy the window! just inform YCP, and let it + // do its thing. + pThis->closeWindow(); + return TRUE; } -bool YGWindow::checkDelete() +void YGWindow::closeWindow() { - fprintf (stderr, "YGDialog close event ...\n"); - if (!m_canDelete) { + if (!m_canClose || m_canClose (m_canCloseData)) YGUI::ui()->sendEvent (new YCancelEvent()); - return TRUE; - } - return m_canDelete (m_closure); } static gboolean key_pressed_cb (GtkWidget *widget, GdkEventKey *event, @@ -128,7 +127,11 @@ // if not main dialog, close it on escape if (event->keyval == GDK_Escape && /* not main window */ main_window != pThis) - return pThis->checkDelete(); + { + pThis->closeWindow(); + return TRUE; + + } if ((event->state & GDK_CONTROL_MASK) && (event->state & GDK_SHIFT_MASK) && (event->state & GDK_MOD1_MASK)) { @@ -180,7 +183,7 @@ if (main_window) ::main_window = this; m_child = NULL; - m_canDelete = NULL; + m_canClose = NULL; { GtkWindow *parent = YGUI::ui()->currentWindow(); @@ -218,10 +221,10 @@ G_CALLBACK (key_pressed_cb), this); } -void YGWindow::setDeleteCallback (YGWindowDeleteFn canDelete, void *closure) +void YGWindow::setCloseCallback (YGWindowCloseFn canClose, void *canCloseData) { - m_canDelete = canDelete; - m_closure = closure; + m_canClose = canClose; + m_canCloseData = canCloseData; } YGDialog::YGDialog (YWidgetOpt &opt) @@ -338,3 +341,4 @@ else return NULL; } + Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=41351&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Wed Oct 10 20:55:43 2007 @@ -4,7 +4,7 @@ #include "YGWidget.h" #include "YDialog.h" -typedef bool (*YGWindowDeleteFn) (void *closure); +typedef bool (*YGWindowCloseFn) (void *closure); class YGWindow { @@ -13,8 +13,8 @@ // we keep a pointer of the child just for debugging // (ie. dump yast tree) YWidget *m_child; - YGWindowDeleteFn m_canDelete; - void *m_closure; + YGWindowCloseFn m_canClose; + void *m_canCloseData; private: static gboolean close_window_cb (GtkWidget *widget, GdkEvent *event, @@ -25,8 +25,8 @@ void setChild (YWidget *new_child); static void ref (YGWindow *window); static void unref (YGWindow *window); - void setDeleteCallback (YGWindowDeleteFn canDelete, void *closure); - bool checkDelete(); + void setCloseCallback (YGWindowCloseFn canClose, void *canCloseData); + void closeWindow(); // Y(G)Widget-like methods GtkWidget *getWidget() { return m_widget; } @@ -47,8 +47,8 @@ void hideWindow(); GtkWindow *getWindow() { return GTK_WINDOW (m_window->getWidget()); } - void setDeleteCallback (bool (*canDelete) (void *closure), void *closure) - { m_window->setDeleteCallback (canDelete, closure); } + void setCloseCallback (YGWindowCloseFn closeCallback, void *closeData) + { m_window->setCloseCallback (closeCallback, closeData); } YGWIDGET_IMPL_COMMON @@ -57,3 +57,4 @@ }; #endif // YGDIALOG_H + Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Wed Oct 10 20:55:43 2007 @@ -2328,7 +2328,7 @@ GtkWindow *window = GTK_WINDOW (dialog->getWindow()); gtk_window_resize (window, 680, 580); - dialog->setDeleteCallback (confirm_cb, this); + dialog->setCloseCallback (confirm_cb, this); YGtkWizard *wizard = YGTK_WIZARD (getWidget()); Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=41351&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Wed Oct 10 20:55:43 2007 @@ -33,8 +33,7 @@ m_min_size = m_widget; else { m_min_size = ygtk_min_size_new (0, 0); - g_object_ref (G_OBJECT (m_min_size)); - gtk_object_sink (GTK_OBJECT (m_min_size)); + g_object_ref_sink (G_OBJECT (m_min_size)); gtk_widget_show (m_min_size); gtk_container_add (GTK_CONTAINER (m_min_size), m_widget); } @@ -286,3 +285,4 @@ hpolicy == GTK_POLICY_AUTOMATIC ? MAX_SCROLL_SIZE : 0, vpolicy == GTK_POLICY_AUTOMATIC ? MAX_SCROLL_SIZE : 0); } + Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=41351&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Wed Oct 10 20:55:43 2007 @@ -1244,3 +1244,4 @@ GtkBindingSet *binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, GDK_F1, 0, "popup_help", 0); } + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41350 - in /trunk/devtools/devtools/skeletons/config/src: Makefile.am XXPkgXX.ycp XXPkgXX2.pm XXPkgXX3.py XXpkgXX_auto.ycp XXpkgXX_proposal.ycp complex.ycp
by dfiser＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: dfiser Date: Wed Oct 10 18:59:00 2007 New Revision: 41350 URL: http://svn.opensuse.org/viewcvs/yast?rev=41350&view=rev Log: - Modified skeleton to do not use global variables of modules directly. - Added python module into skeleton and fixed perl module there. Added: trunk/devtools/devtools/skeletons/config/src/XXPkgXX3.py Modified: trunk/devtools/devtools/skeletons/config/src/Makefile.am trunk/devtools/devtools/skeletons/config/src/XXPkgXX.ycp trunk/devtools/devtools/skeletons/config/src/XXPkgXX2.pm (contents, props changed) trunk/devtools/devtools/skeletons/config/src/XXpkgXX_auto.ycp trunk/devtools/devtools/skeletons/config/src/XXpkgXX_proposal.ycp trunk/devtools/devtools/skeletons/config/src/complex.ycp Modified: trunk/devtools/devtools/skeletons/config/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/Makefile.am (original) +++ trunk/devtools/devtools/skeletons/config/src/Makefile.am Wed Oct 10 18:59:00 2007 @@ -18,7 +18,8 @@ module_DATA = \ XXPkgXX.ycp \ - XXPkgXX2.pm + XXPkgXX2.pm \ + XXPkgXX3.py # create a symlink for local build, #145327 XXpkgXX: Modified: trunk/devtools/devtools/skeletons/config/src/XXPkgXX.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/XXPkgXX.ycp (original) +++ trunk/devtools/devtools/skeletons/config/src/XXPkgXX.ycp Wed Oct 10 18:59:00 2007 @@ -48,23 +48,23 @@ /** * Data was modified? */ -global boolean modified = false; +boolean modified = false; /** */ -global boolean proposal_valid = false; +boolean proposal_valid = false; /** * Write only, used during autoinstallation. * Don't run services and SuSEconfig, it's all done at one place. */ -global boolean write_only = false; +boolean write_only = false; /** * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +boolean() AbortFunction = Modified; /** * Abort function @@ -90,10 +90,38 @@ /** * Mark as modified, for Autoyast. */ -global void SetModified() { - modified = true; +global void SetModified(boolean value) { + modified = true; + } + +global boolean ProposalValid() { + return proposal_valid; +} + +global void SetProposalValid(boolean value) { + proposal_valid = value; +} + +/** + * @return true if module is marked as "write only" (don't start services etc...) + */ +global boolean WriteOnly() { + return write_only; } +/** + * Set write_only flag (for autoinstalation). + */ +global void SetWriteOnly(boolean value) { + write_only = value; +} + + +global void SetAbortFunction(boolean() function) { + AbortFunction = function; +} + + // Settings: Define all variables needed for configuration of XXpkgXX // TODO FIXME: Define all the variables necessary to hold // TODO FIXME: the configuration here (with the appropriate Modified: trunk/devtools/devtools/skeletons/config/src/XXPkgXX2.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== Binary files - no diff available. Added: trunk/devtools/devtools/skeletons/config/src/XXPkgXX3.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/XXPkgXX3.py (added) +++ trunk/devtools/devtools/skeletons/config/src/XXPkgXX3.py Wed Oct 10 18:59:00 2007 @@ -0,0 +1,301 @@ +#!/usr/bin/env python + +# ------------------------------------------------------------------------------ +# Copyright (c) 2006 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ + +# File: modules/XXPkgXX3.py +# Package: Configuration of XXpkgXX +# Summary: XXPkgXX settings, input and output functions +# Authors: XXmaintainerXX <XXemailXX> +# +# $Id: XXPkgXX3.py 27914 2006-02-13 14:32:08Z locilka $ +# +# Representation of the configuration of XXpkgXX. +# Input and output routines. + + +from time import sleep +from YCPDeclarations import YCPDeclare +import ycp +from ycp import Term, Symbol, Path +from ycp import y2internal, y2security, y2error, y2warning, y2milestone, y2debug + +## + # Set textdomain + # +import gettext +gettext.install("XXpkgXX") + +ycp.import_module("Progress") +ycp.import_module("Report") +ycp.import_module("Summary") +ycp.import_module("Message") + +## + # Data was modified? + # +modified = False + +## + # +proposal_valid = False + +## + # Write only, used during autoinstallation. + # Don't run services and SuSEconfig, it's all done at one place. + # +write_only = False + +## + # Data was modified? + # @return true if modified + # +@YCPDeclare("boolean") +def Modified(): + global modified + y2debug ("modified=%d" % (modified)); + return modified + +## + # Mark as modified, for Autoyast. + # +@YCPDeclare("void", "boolean") +def SetModified(value): + global modified + modified = value + +@YCPDeclare("boolean") +def ProposalValid(): + global proposal_valid + return proposal_valid + +@YCPDeclare("void", "boolean") +def SetProposalValid(value): + global proposal_valid + proposal_valid = value + +@YCPDeclare("boolean") +def WriteOnly(): + global write_only + return write_only + +@YCPDeclare("void", "boolean") +def SetWriteOnly(value): + global write_only + write_only = value + + +# Settings: Define all variables needed for configuration of XXpkgXX +# TODO FIXME: Define all the variables necessary to hold +# TODO FIXME: the configuration here (with the appropriate +# TODO FIXME: description) +# TODO FIXME: For example: +# ## +# # List of the configured cards. +# # +# cards = [] +# +# ## +# # Some additional parameter needed for the configuration. +# # +# additional_parameter = 1 + +## + # Read all XXpkgXX settings + # @return true on success + # +@YCPDeclare("boolean") +def Read(): + global modified + + # XXPkgXX read dialog caption + caption = _("Initializing XXpkgXX Configuration") + + # TODO FIXME Set the right number of stages + steps = 4 + + sl = 0.5 + sleep(sl) + + # TODO FIXME Names of real stages + # We do not set help text here, because it was set outside + ycp.Progress.New(caption, " ", steps, [ + # Progress stage 1/3 + _("Read the database"), + # Progress stage 2/3 + _("Read the previous settings"), + # Progress stage 3/3 + _("Detect the devices") + ], [ + # Progress step 1/3 + _("Reading the database..."), + # Progress step 2/3 + _("Reading the previous settings..."), + # Progress step 3/3 + _("Detecting the devices..."), + # Progress finished + _("Finished") + ], + "" + ) + + # read database + ycp.Progress.NextStage(); + # Error message + if False: + ycp.Report.Error(_("Cannot read the database1.")) + sleep(sl) + + # read another database + ycp.Progress.NextStep() + # Error message + if False: + ycp.Report.Error(_("Cannot read the database2.")) + sleep(sl) + + # read current settings + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error(ycp.Message.CannotReadCurrentSettings()) + sleep(sl) + + # detect devices + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Warning(_("Cannot detect devices.")) + sleep(sl) + + # Progress finished + ycp.Progress.NextStage() + sleep(sl) + + modified = False + + return True + +## + # Write all XXpkgXX settings + # @return true on success + # +@YCPDeclare("boolean") +def Write(): + # XXPkgXX read dialog caption + caption = _("Saving XXpkgXX Configuration") + + # TODO FIXME And set the right number of stages + steps = 2 + + sl = 0.5 + sleep(sl) + + # TODO FIXME Names of real stages + # We do not set help text here, because it was set outside + ycp.Progress.New(caption, " ", steps, [ + # Progress stage 1/2 + _("Write the settings"), + # Progress stage 2/2 + _("Run SuSEconfig") + ], [ + # Progress step 1/2 + _("Writing the settings..."), + # Progress step 2/2 + _("Running SuSEconfig..."), + # Progress finished + _("Finished") + ], + "" + ) + + # write settings + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error (_("Cannot write settings.")) + sleep(sl) + + # run SuSEconfig + ycp.Progress.NextStage() + # Error message + if False: + ycp.Report.Error(ycp.Message.SuSEConfigFailed()) + sleep(sl) + + # Progress finished + ycp.Progress.NextStage() + sleep(sl) + + return True + +## + # Get all XXpkgXX settings from the first parameter + # (For use by autoinstallation.) + # @param settings The YCP structure to be imported. + # @return boolean True on success + # +@YCPDeclare("boolean", "map") +def Import(map_settings): + # TODO FIXME: your code here (fill the above mentioned variables)... + return True + +## + # Dump the XXpkgXX settings to a single map + # (For use by autoinstallation.) + # @return map Dumped settings (later acceptable by Import ()) + # +@YCPDeclare("map") +def Export(): + # TODO FIXME: your code here (return the above mentioned variables)... + return {} + +## + # Create a textual summary and a list of unconfigured cards + # @return summary of the current configuration + # +@YCPDeclare("list") +def Summary(): + # TODO FIXME: your code here... + # Configuration summary text for autoyast + return [ _("Configuration summary ...") ] + +## + # Create an overview table with all configured cards + # @return table items + # +@YCPDeclare("list") +def Overview(): + # TODO FIXME: your code here... + return [] + +## + # Return packages needed to be installed and removed during + # Autoinstallation to insure module has all needed software + # installed. + # @return map with 2 lists. + # +@YCPDeclare("map") +def AutoPackages(): + # TODO FIXME: your code here... + return { + "install" : [], + "remove" : [] + } + +# EOF Modified: trunk/devtools/devtools/skeletons/config/src/XXpkgXX_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/XXpkgXX_auto.ycp (original) +++ trunk/devtools/devtools/skeletons/config/src/XXpkgXX_auto.ycp Wed Oct 10 18:59:00 2007 @@ -98,7 +98,7 @@ else if (func == "Write") { import "Progress"; boolean progress_orig = Progress::set (false); - XXPkgXX::write_only = true; + XXPkgXX::SetWriteOnly (true); ret = XXPkgXX::Write(); Progress::set (progress_orig); } @@ -114,7 +114,7 @@ * return boolean */ else if (func == "SetModified") { - XXPkgXX::SetModified (); + XXPkgXX::SetModified (true); ret = true; } Modified: trunk/devtools/devtools/skeletons/config/src/XXpkgXX_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/XXpkgXX_proposal.ycp (original) +++ trunk/devtools/devtools/skeletons/config/src/XXpkgXX_proposal.ycp Wed Oct 10 18:59:00 2007 @@ -52,8 +52,8 @@ symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; - if(force_reset || !XXPkgXX::proposal_valid) { - XXPkgXX::proposal_valid = true; + if(force_reset || !XXPkgXX::ProposalValid()) { + XXPkgXX::SetProposalValid (true); boolean progress_orig = Progress::set (false); XXPkgXX::Read(); Progress::set (progress_orig); Modified: trunk/devtools/devtools/skeletons/config/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/skeletons/conf… ============================================================================== --- trunk/devtools/devtools/skeletons/config/src/complex.ycp (original) +++ trunk/devtools/devtools/skeletons/config/src/complex.ycp Wed Oct 10 18:59:00 2007 @@ -63,7 +63,7 @@ */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); - // XXPkgXX::AbortFunction = PollAbort; + // XXPkgXX::SetAbortFunction(PollAbort); if (!Confirm::MustBeRoot()) return `abort; boolean ret = XXPkgXX::Read(); return ret ? `next : `abort; @@ -75,7 +75,7 @@ */ symbol WriteDialog() { Wizard::RestoreHelp(HELPS["write"]:""); - // XXPkgXX::AbortFunction = PollAbort; + // XXPkgXX::SetAbortFunction(PollAbort); boolean ret = XXPkgXX::Write(); return ret ? `next : `abort; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41349 - in /trunk/python-bindings/src: YCPDeclarations.cc YCPDeclarations.py
by dfiser＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: dfiser Date: Wed Oct 10 18:56:13 2007 New Revision: 41349 URL: http://svn.opensuse.org/viewcvs/yast?rev=41349&view=rev Log: - Added YCP types 'map' and 'list' into YCPDeclarations. Modified: trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YCPDeclarations.py Modified: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (original) +++ trunk/python-bindings/src/YCPDeclarations.cc Wed Oct 10 18:56:13 2007 @@ -146,6 +146,10 @@ return Type::Symbol; if (type == "term") return Type::Term; + if (type == "map") + return Type::Map; + if (type == "list") + return Type::List; // default: return Type::Any; Modified: trunk/python-bindings/src/YCPDeclarations.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.py (original) +++ trunk/python-bindings/src/YCPDeclarations.py Wed Oct 10 18:56:13 2007 @@ -60,7 +60,9 @@ "symbol", "path", "float", - "void" + "void", + "map", + "list" ) def __init__(self, return_type, *params_types): -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41348 - /branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h
by sh-sh-sh＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: sh-sh-sh Date: Wed Oct 10 18:52:02 2007 New Revision: 41348 URL: http://svn.opensuse.org/viewcvs/yast?rev=41348&view=rev Log: consistency Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQGeneri… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h Wed Oct 10 18:52:02 2007 @@ -59,7 +59,7 @@ * * Reimplemented from YWidget. **/ - void setEnabled( bool enabled ); + virtual void setEnabled( bool enabled ); /** * Returns 'true' if this button is enabled, 'false' otherwise. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41347 - /branches/tmp/sh/mod-ui/qt/src/YQComboBox.h
by sh-sh-sh＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: sh-sh-sh Date: Wed Oct 10 18:51:34 2007 New Revision: 41347 URL: http://svn.opensuse.org/viewcvs/yast?rev=41347&view=rev Log: doc Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.h Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.h Wed Oct 10 18:51:34 2007 @@ -86,9 +86,9 @@ bool isValidText( const QString & txt ) const; /** - * Inherited from YWidget: Sets the enabled state of the - * widget. All new widgets are enabled per definition. Only - * enabled widgets can take user input. + * Set enabled / disabled state. + * + * Reimplemented from YWidget. **/ virtual void setEnabled( bool enabled ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41346 - /trunk/python-bindings/src/YCPDeclarations.py
by dfiser＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: dfiser Date: Wed Oct 10 18:37:40 2007 New Revision: 41346 URL: http://svn.opensuse.org/viewcvs/yast?rev=41346&view=rev Log: - Added YCP type 'void' to list of supported YCP types in Python. Modified: trunk/python-bindings/src/YCPDeclarations.py Modified: trunk/python-bindings/src/YCPDeclarations.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.py (original) +++ trunk/python-bindings/src/YCPDeclarations.py Wed Oct 10 18:37:40 2007 @@ -59,7 +59,8 @@ "term", "symbol", "path", - "float" + "float", + "void" ) def __init__(self, return_type, *params_types): -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41345 - in /trunk/python-bindings/src: YCPDeclarations.cc YPython.cc YPythonNamespace.cc
by dfiser＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: dfiser Date: Wed Oct 10 18:30:11 2007 New Revision: 41345 URL: http://svn.opensuse.org/viewcvs/yast?rev=41345&view=rev Log: - YPythonNamespace now uses YCPDeclarations class to determine YCP types in function declarations in python module. - Added some necessary error checkings, before that it sometimes causes segmentation faults. Modified: trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (original) +++ trunk/python-bindings/src/YCPDeclarations.cc Wed Oct 10 18:30:11 2007 @@ -111,6 +111,9 @@ PyObject *YCPDeclarations::_getItemFromFunctionMap(PyObject *key) { + if (_py_self == NULL) + return NULL; + PyObject *dict = PyModule_GetDict(_py_self); PyObject *func_map = PyDict_GetItemString(dict, "_function_map"); @@ -158,6 +161,9 @@ { DBG("YCPDeclarations - constructor"); _py_self = PyImport_ImportModule("YCPDeclarations"); + if (_py_self == NULL){ + DBG("YCPDeclarations::YCPDeclarations() - Failed to import YCPDeclarations module!"); + } } YCPDeclarations::~YCPDeclarations() Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Wed Oct 10 18:30:11 2007 @@ -140,6 +140,16 @@ //check if dictionary contain "dictionary" for module if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { pMain = PyImport_ImportModule(module_name.c_str()); + if (pMain == NULL){ + y2error("Can't import module %s", module_name.c_str()); + + if (PyErr_Occurred() != NULL){ + PyErr_Print(); + } + + return YCPError("The module was not imported"); + } + int ret = PyDict_SetItem(YPython::_pMainDicts, pModuleName, PyModule_GetDict(pMain)); if (ret != 0) return YCPError("The module was not imported"); Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Wed Oct 10 18:30:11 2007 @@ -18,6 +18,11 @@ #include <YPython.h> #include <stdio.h> +#include "YCPDeclarations.h" +#define DBG(str) \ + std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ + std::cerr.flush() + /** @@ -148,6 +153,12 @@ PyObject * fun_names; //list of keys from dictionary (YPython::yPython()->pMain()) PyObject * fun_code; //code of function + //Declarations (using YPCDelcarations python module) + YCPDeclarations *decl = YCPDeclarations::instance(); + FunctionTypePtr sym_tp; + std::vector<constTypePtr> list_of_types; + int tmp; + int num_fun_names = 0; //number of keys from dictionary int count = 0; // position. arbitrary numbering @@ -155,6 +166,10 @@ //obtain main dictionary of globals variables pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),name.c_str()); + if (pMainDict == NULL){ + y2error("Can't load module %s", name.c_str()); + return; + } //keys from dictionary fun_names = PyDict_Keys(pMainDict); @@ -172,14 +187,26 @@ //check if symbol is callable if (PyFunction_Check(pFunc)) { - FunctionTypePtr sym_tp = new FunctionType (Type::Any); - fun_code = PyFunction_GetCode(pFunc); num = ((PyCodeObject *) fun_code)->co_argcount; - //y2milestone ("Number of parameters: %d", num); - //add types and number of arguments into SymbolEntry table - for (long j = 0; j < num; j++) { - sym_tp->concat(Type::Any); + + if (decl->exists((PyFunctionObject *)pFunc) + && decl->numParams((PyFunctionObject *)pFunc) == num){ + + sym_tp = new FunctionType(decl->returnType((PyFunctionObject *)pFunc)); + + list_of_types = decl->params((PyFunctionObject *)pFunc); + tmp = list_of_types.size(); + for (int i=0; i < tmp; i++){ + sym_tp->concat(list_of_types[i]); + } + }else{ + sym_tp = new FunctionType(Type::Any); + //y2milestone ("Number of parameters: %d", num); + //add types and number of arguments into SymbolEntry table + for (long j = 0; j < num; j++) { + sym_tp->concat(Type::Any); + } } //y2milestone ("Callable function %s", PyString_AsString(item)); // symbol entry for the function -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41344 - /tags/stable-2_16_3/network/
by mzugec＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mzugec Date: Wed Oct 10 18:20:19 2007 New Revision: 41344 URL: http://svn.opensuse.org/viewcvs/yast?rev=41344&view=rev Log: Created tag stable-2_16_3 for network Added: tags/stable-2_16_3/network/ - copied from r41343, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41343 - /tags/stable-2_16_3/
by mzugec＠svn.opensuse.org 10 Oct '07

10 Oct '07

Author: mzugec Date: Wed Oct 10 18:20:17 2007 New Revision: 41343 URL: http://svn.opensuse.org/viewcvs/yast?rev=41343&view=rev Log: Created tag stable-2_16_3 Added: tags/stable-2_16_3/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0