Revision
120
Author
emsmith
Date
2007-01-12 05:12:00 -0800 (Fri, 12 Jan 2007)

Log Message

underscores to dashes in image naming (oops), fix some E_STRICT stuff by renaming, this might break some apps...  and only use _ in front of a class property if it's supposed to be private!

Modified Paths

Added Paths

Removed Paths

Diff

Copied: trunk/cc_icons/24x24/view-left-right.png (from rev 118, trunk/cc_icons/24x24/view_left_right.png) ( => )


Copied: trunk/cc_icons/24x24/view-right.png (from rev 118, trunk/cc_icons/24x24/view_right.png)

Copied: trunk/cc_icons/24x24/view-top-bottom.png (from rev 118, trunk/cc_icons/24x24/view_top_bottom.png) ( => )


Deleted: trunk/cc_icons/24x24/view_left_right.png
===================================================================
(Binary files differ)

Deleted: trunk/cc_icons/24x24/view_right.png


(Binary files differ)

Deleted: trunk/cc_icons/24x24/view_top_bottom.png


(Binary files differ)

Copied: trunk/cc_icons/32x32/view-top-bottom.png (from rev 118, trunk/cc_icons/32x32/view_top_bottom.png) ( => )


Deleted: trunk/cc_icons/32x32/view_top_bottom.png
===================================================================
(Binary files differ)

Modified: trunk/lib/actions.class.php (119 => 120)


--- trunk/lib/actions.class.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/lib/actions.class.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -132,7 +132,7 @@
 		$tips = CC_Tooltips::instance();
 		$item = $this->get_action($group, $action);
 		$widget = $item->create_menu_item();
-		$tips->set_tip($widget, $item->get_property('tooltip'));
+		$tips->set_tooltip($widget, $item->get_property('tooltip'));
 		$widget->set_data('group', $group);
 		$widget->set_data('action', $action);
 		return $widget;
@@ -155,7 +155,7 @@
 		$item = $this->get_action($group, $action);
 		$widget = $item->create_tool_item();
 		$widget->set_use_underline(TRUE);
-		$tips->set_tip($widget, $item->get_property('tooltip'));
+		$tips->set_tooltip($widget, $item->get_property('tooltip'));
 		$widget->set_data('group', $group);
 		$widget->set_data('action', $action);
 		return $widget;
@@ -187,7 +187,7 @@
 		{
 			$button = new GtkButton();
 		}
-		$tips->set_tip($button, $item->get_property('tooltip'));
+		$tips->set_tooltip($button, $item->get_property('tooltip'));
 		$item->connect_proxy($button);
 		$button->set_data('group', $group);
 		$button->set_data('action', $action);
@@ -208,7 +208,7 @@
 		$tips = CC_Tooltips::instance();
 		$item = $this->get_action($group, $action);
 		$image = $item->create_icon($size);
-		$tips->set_tip($image, $item->get_property('tooltip'));
+		$tips->set_tooltip($image, $item->get_property('tooltip'));
 		$image->set_data('group', $group);
 		$image->set_data('action', $action);
 		return $image;
@@ -229,7 +229,7 @@
 		$item = $this->get_action($group, $action);
 		$widget->set_data('group', $group);
 		$widget->set_data('action', $action);
-		$tips->set_tip($widget, $item->get_property('tooltip'));
+		$tips->set_tooltip($widget, $item->get_property('tooltip'));
 		return $item->connect_proxy($widget);
 	}
 

Modified: trunk/lib/message.class.php (119 => 120)


--- trunk/lib/message.class.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/lib/message.class.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -97,7 +97,7 @@
 	}
 
 	/**
-	 * public function set_parent
+	 * public function parent
 	 *
 	 * although the message may be triggered by an error handler
 	 * manual messages may wish to set a parent window
@@ -105,7 +105,7 @@
 	 * @param object instanceof GtkWindow $parent GtkWindow object parent
 	 * @return void
 	 */
-	public function set_parent($parent)
+	public function parent($parent)
 	{
 		$this->set_transient_for($parent);
 		$this->set_destroy_with_parent(true);

Modified: trunk/lib/splash.class.php (119 => 120)


--- trunk/lib/splash.class.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/lib/splash.class.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -92,7 +92,7 @@
 	}
 
 	/**
-	 * public function set_parent
+	 * public function parent
 	 *
 	 * although the splashscreen is created first,
 	 * it changes to a transient for the main window
@@ -101,7 +101,7 @@
 	 * @param object instanceof GtkWindow $parent GtkWindow object parent
 	 * @return void
 	 */
-	public function set_parent($parent)
+	public function parent($parent)
 	{
 		$this->set_transient_for($parent);
 		$this->set_destroy_with_parent(true);

Modified: trunk/lib/tooltips.class.php (119 => 120)


--- trunk/lib/tooltips.class.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/lib/tooltips.class.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -65,14 +65,14 @@
 	}
 
 	/**
-	 * public function set_tip
+	 * public function set_tooltip
 	 *
 	 * overrides original function for GtkToolItem fix
 	 *
 	 * @param object $wiget instanceof GtkObject
 	 * @return void
 	 */
-	public function set_tip($widget, $tooltip, $path = null)
+	public function set_tooltip($widget, $tooltip, $path = null)
 	{
 		if ($widget instanceof GtkToolItem)
 		{

Modified: trunk/lib/window.class.php (119 => 120)


--- trunk/lib/window.class.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/lib/window.class.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -47,9 +47,9 @@
 
 	/**
 	 * when used with window manager, window is modal
-	 * @var $modal bool
+	 * @var $is_modal bool
 	 */
-	protected $_modal = false;
+	protected $is_modal = false;
 
 	/**
 	 * we keep track of our restore state event and remove the signal after
@@ -148,11 +148,11 @@
 	public function hide_all()
 	{
 		if (class_exists('CC_Wm') && CC_Wm::is_window($this->get_name()) &&
-			$this->_modal)
+			$this->is_modal)
 		{
 			parent::grab_remove();
 			$return = parent::hide_all();
-			$this->_modal = false;
+			$this->is_modal = false;
 			return $return;
 		}
 		else
@@ -174,7 +174,7 @@
 		{
 			$return = parent::show_all();
 			parent::grab_add();
-			$this->_modal = true;
+			$this->is_modal = true;
 			return $return;
 		}
 		else

Modified: trunk/run.php (119 => 120)


--- trunk/run.php	2007-01-12 13:07:14 UTC (rev 119)
+++ trunk/run.php	2007-01-12 13:12:00 UTC (rev 120)
@@ -27,7 +27,7 @@
  * @filesource
  */
 
-error_reporting(E_ALL);
+error_reporting(E_ALL | E_STRICT);
 
 include (dirname(__FILE__) . '/lib/cc.class.php');