[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/info [POSSIBLY UNSAFE]
From:       Helge Deller <deller () kde ! org>
Date:       2004-08-31 21:33:58
Message-ID: 20040831213358.96813991F () office ! kde ! org
[Download RAW message or body]

CVS commit by deller: 

new opengl kinfocenter module, written by "Ylia K" <k_ilya@ukr.net>


  A            configure.in.bot   1.1
  A            opengl.cpp   1.1 [POSSIBLY UNSAFE: popen,printf] [GPL (v2+)]
  A            opengl.desktop   1.1
  M +9 -4      Makefile.am   1.49
  M +3 -0      configure.in.in   1.9
  M +1 -0      info.h   1.19
  M +10 -0     main.cpp   1.24
  M +3 -3      xserver.desktop   1.220


--- kdebase/kcontrol/info/Makefile.am  #1.48:1.49
@@ -1,10 +1,15 @@
 kde_module_LTLIBRARIES = kcm_info.la
 
-kcm_info_la_SOURCES = main.cpp memory.cpp
+if COMPILE_GL_INFO
+GL_INFO_CPP = opengl.cpp
+AM_CXXFLAGS = -DINFO_OPENGL_AVAILABLE
+endif
+
+kcm_info_la_SOURCES = main.cpp memory.cpp $(GL_INFO_CPP)
 
 kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined \
                $(FRAMEWORK_COREAUDIO)
-kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) \
$(LIBKSTAT) $(LIBDEVINFO) +kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) \
$(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB)  
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) $(GLINC)
  
 kcm_info_la_METASOURCES = AUTO
@@ -15,4 +20,4 @@
 
 xdg_apps_DATA = memory.desktop processor.desktop dma.desktop \
-        interrupts.desktop ioports.desktop pci.desktop sound.desktop \
+        interrupts.desktop ioports.desktop opengl.desktop pci.desktop sound.desktop \
\  devices.desktop scsi.desktop partitions.desktop xserver.desktop

--- kdebase/kcontrol/info/configure.in.in  #1.8:1.9
@@ -17,3 +17,6 @@
 AC_SUBST(LIB_TRU64_MACH)
 
+AC_HAVE_GL( have_gl=yes, have_gl=no )
+AM_CONDITIONAL(COMPILE_GL_INFO, test x$have_gl = xyes)
+
 KDE_CHECK_LONG_LONG

--- kdebase/kcontrol/info/info.h  #1.18:1.19
@@ -30,4 +30,5 @@ bool GetInfo_SCSI( QListView *lBox );
 bool GetInfo_Partitions( QListView *lBox );
 bool GetInfo_XServer_and_Video( QListView *lBox );
+extern bool GetInfo_OpenGL( QListView *lBox );
 
 class KInfoListWidget : public KCModule

--- kdebase/kcontrol/info/main.cpp  #1.23:1.24
@@ -130,3 +130,13 @@ extern "C"
   }
 
+  KCModule *create_opengl(QWidget *parent, const char * )
+  { 
+#ifdef INFO_OPENGL_AVAILABLE
+    return new KInfoListWidget(i18n("OpenGL"), parent, "kcminfo", GetInfo_OpenGL);
+#else
+    return 0;
+#endif
+  }
+  
+
 }

--- kdebase/kcontrol/info/xserver.desktop  #1.219:1.220
@@ -141,5 +141,5 @@
 Comment[zu]=Ulwazi lomlekeleli we-X
 
-Keywords=X,X-Server,XServer,XFree86,Display,System Information
+Keywords=X,X-Server,XServer,XFree86,Display,VideoCard,System Information
 Keywords[af]=X,X-Server,XServer,XFree86,Display,System Informasie
 Keywords[ar]=X,X-Server,خادم X,X ويندو,العرض,معلومات \
النظام @@ -153,5 +153,5 @@
 Keywords[cy]=X,Gweinydd-X,GweinyddX,XFree86,Dangosydd,Gwybodaeth Cysawd
 Keywords[da]=X,X-server,Xserver,XFree86,Skærm,Systeminformation
-Keywords[de]=X,X11,X-Server,XServer,XFree86,Display,Systeminformation
+Keywords[de]=X,X11,X-Server,XServer,XFree86,Display,Grafikkarte,Systeminformation
 Keywords[el]=X,Εξυπηρετητής-X,XServer,XFree86,Οθόνη,� \
ληροφορίες συστήματος  \
Keywords[eo]=X,X-servilo,XFree86,ekrano,fenestroj,sistemo,operaciumo,informo @@ \
-194,5 +194,5 @@  Keywords[th]=X,เซิร์ฟเวอร์ \
X,XServer,XFree86,ระบบแสดงผล,ข้อมูลระบบ  \
                Keywords[tr]=X,X-Sunucu,XSunucu,XFree86,Görüntü,Sistem Hakkında \
                Bilgi
-Keywords[uk]=x,x11,x-server,xserver,xfree86,display,системна \
інформація \
+Keywords[uk]=x,x11,x-server,xserver,xfree86,display,videocard,системна \
інформація  Keywords[uz]=X,X \
сервер,XFree86,X-Сервер,Дисплей,Тизим ҳақида \
маълумот  Keywords[ven]=X,Siva ya X,Xsiva,XFree86,Vhonisa,mafhungo a sisitemu


[prev in list] [next in list] [prev in thread] [next in thread]