Revision

83

Author

leonpegg

Date

2007-01-03 04:59:14 -0800 (Wed, 03 Jan 2007)

Log Message

Updated config.class.php, main.class.php to use new CC_Os (replacement of CC_Folders) and fixed errors in os.class.php

Modified Paths

• trunk/lib/config.class.php
• trunk/lib/main.class.php
• trunk/lib/os.class.php
• trunk/programs/ide/lib/ide_notebook.class.php

Diff

--- trunk/lib/config.class.php	2006-12-29 08:13:36 UTC (rev 82)
+++ trunk/lib/config.class.php	2007-01-03 12:59:14 UTC (rev 83)
@@ -61,7 +61,7 @@
 	{
 
 		$this->program = CC::$program;
-		$folders = CC_Folders::instance();
+		$folders = CC_Os::instance();
 		$this->file = $folders->get_appdata() . strtolower($this->program) . '.config.ini';
 		if (file_exists($this->file))
 		{

--- trunk/lib/main.class.php	2006-12-29 08:13:36 UTC (rev 82)
+++ trunk/lib/main.class.php	2007-01-03 12:59:14 UTC (rev 83)
@@ -360,7 +360,7 @@
 	 */
 	public function on_website()
 	{
-		CC_Folders::instance()->open_file($this->website);
+		CC_Os::instance()->launch($this->website);
 		return;
 	}
 

--- trunk/lib/os.class.php	2006-12-29 08:13:36 UTC (rev 82)
+++ trunk/lib/os.class.php	2007-01-03 12:59:14 UTC (rev 83)
@@ -27,8 +27,47 @@
  */
 class CC_Os
 {
+	/**
+	 * @const LINUX OS
+	 */
+	const LINUX = 1;
 
 	/**
+	 * @const UNIX OS
+	 */
+	const UNIX = 2;
+
+	/**
+	 * @const WIN32 OS
+	 */
+	const WIN32 = 3;
+
+	/**
+	 * @const WINNT OS
+	 */
+	const WINNT = 4;
+
+	/**
+	 * @const MAC OS
+	 */
+	const MAC = 5;
+
+	/**
+	 * @const GNOME Desktop
+	 */
+	const GNOME = 6;
+
+	/**
+	 * @const KDE Desktop
+	 */
+	const KDE = 7;
+
+	/**
+	 * @const unknown Desktop/OS
+	 */
+	const UNKNOWN = 8;
+
+	/**
 	 * singleton instance for this class
 	 * @var $singleton instanceof Characters
 	 */
@@ -309,7 +348,7 @@
 	{
 		if (is_null(self::$singleton))
 		{
-			self::$singleton = new CC_Folders();
+			self::$singleton = new CC_Os();
 		}
 		return self::$singleton;
 	}

--- trunk/programs/ide/lib/ide_notebook.class.php	2006-12-29 08:13:36 UTC (rev 82)
+++ trunk/programs/ide/lib/ide_notebook.class.php	2007-01-03 12:59:14 UTC (rev 83)
@@ -11,8 +11,9 @@
 	public function new_file(){
 		$view = new GtkScrolledWindow();
 		$lang_mgr = new GtkSourceLanguagesManager();
-		$lang = $lang_mgr->get_language_from_mime_type("text/x-php");
-		$buffer = GtkSourceBuffer::new_with_language($lang);
+		# removed lang_mgr to cant seem to get it working since using new builds
+		//$lang = $lang_mgr->get_language_from_mime_type("text/x-php");
+		$buffer = new GtkSourceBuffer(); //::new_with_language($lang);
 		$source = GtkSourceView::new_with_buffer($buffer);
 		$source->set_show_line_numbers(1);
 		$buffer->set_highlight(1);