OSSP CVS Repository

ossp - Check-in [2773]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 2773
Date: 2002-Nov-08 13:21:34 (local)
2002-Nov-08 12:21:34 (UTC)
User:ms
Branch:
Comment: Abandonment of all karm sources, and total reworking of project titraq.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/ChangeLog      added-> 1.2
ossp-pkg/as/as-gui/Makefile.in      1.3 -> 1.4     12 inserted, 7 deleted
ossp-pkg/as/as-gui/README      added-> 1.2
ossp-pkg/as/as-gui/TODO      1.2 -> 1.3     6 inserted, 22 deleted
ossp-pkg/as/as-gui/as_gfx/ossplogo.xpm      added-> 1.1
ossp-pkg/as/as-gui/as_main.cpp      1.2 -> 1.3     43 inserted, 7 deleted
ossp-pkg/as/as-gui/configure.in      1.2 -> 1.3     3 inserted, 2 deleted
ossp-pkg/titraq/AUTHORS      added-> 1.2
ossp-pkg/titraq/ChangeLog      added-> 1.2
ossp-pkg/titraq/Makefile.in      1.3 -> 1.4     12 inserted, 7 deleted
ossp-pkg/titraq/README      added-> 1.2
ossp-pkg/titraq/TODO      1.2 -> 1.3     6 inserted, 22 deleted
ossp-pkg/titraq/configure.in      1.2 -> 1.3     3 inserted, 2 deleted
ossp-pkg/titraq/gfx/cw.xpm      added-> 1.1
ossp-pkg/titraq/gfx/osspfull.xpm      added-> 1.1
ossp-pkg/titraq/gfx/ossplogo.xpm      added-> 1.1
ossp-pkg/titraq/main.cpp      1.2 -> 1.3     43 inserted, 7 deleted
ossp-pkg/titraq/titraq_version.c      1.2->removed
ossp-pkg/as/as-gui/ChangeLog -> 1.2 

*** /dev/null    Sat Nov 23 01:37:31 2024
--- -    Sat Nov 23 01:38:01 2024
***************
*** 0 ****
--- 1,3 ----
+ Geschichte des OSSP titraq in Vorwaerts Cronordnung
+ 
+ 021108 Projekt Erzeugung

ossp-pkg/as/as-gui/Makefile.in 1.3 -> 1.4 

--- Makefile.in  2002/11/05 18:15:50     1.3
+++ Makefile.in  2002/11/08 12:21:34     1.4
@@ -62,17 +62,17 @@
 TRUE            = true
 
 PROG_NAME       = titraq
-
-TARGET          = $(TARGET_PROGS) $(TARGET_MANS)
 TARGET_PROGS    = titraq
 TARGET_MANS     = titraq.1 titraq.conf.5
 
-SRCS            = main.cpp top.cpp karm.cpp titraq_version.c
+SRCS            = main.cpp titraq.cpp titraq_version.c
+
+OBJS            = main.o titraq.o titraq_version.o
 
-OBJS            = main.o top.o karm.o titraq_version.o
+GRAFX           = gfx/ossplogo.xpm
 
 # Qt meta object compiler
-MOC_IN          = karm.h
+MOC_IN          = titraq.h
 MOC_OUT         = moc_titraq.cpp
 MOC_OBJ         = moc_titraq.o
 
@@ -90,7 +90,10 @@
 .cxx.o:
         $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
 
-all: Makefile $(TARGET)
+all: Makefile $(TARGET_PROGS) $(TARGET_MANS)
+
+#$(PROG_NAME): Makefile $(OBJS) $(MOC_OBJ) $(GRAFX)
+#       $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(MOC_OBJ) $(LIBS)
 
 $(PROG_NAME): $(OBJS) $(MOC_OBJ)
         $(CXX) $(LDFLAGS) -o $@ $+ $(LIBS)
@@ -130,7 +133,9 @@
         $(RM) $(DESTDIR)$(mandir)/man5/titraq.conf.5
 
 clean:
-        $(RM) $(TARGET) $(OBJS) $(MOC_OBJ) $(PROG_NAME).core titraq_pcre.tab
+        $(RM) $(TARGET_PROGS) $(OBJS) $(MOC_OBJ)
+    $(RM) titraq.conf.5 titraq.1
+    $(RM) titraq_pcre.tab *.core
 
 distclean: clean
         $(RM) config.log config.status config.cache # Generated by ./configure

ossp-pkg/as/as-gui/README -> 1.2 

*** /dev/null    Sat Nov 23 01:37:31 2024
--- -    Sat Nov 23 01:38:01 2024
***************
*** 0 ****
--- 1,9 ----
+ To build titraq:
+   ./devtool autogen
+   ./devtool configure
+   make
+ 
+ Expect:
+   Executable 'titraq' statically linked to Qt and X libs
+   Stand alone executable
+

ossp-pkg/as/as-gui/TODO 1.2 -> 1.3 

--- TODO 2002/10/24 19:07:39     1.2
+++ TODO 2002/11/08 12:21:34     1.3
@@ -9,27 +9,6 @@
 
 Must do
 -------
-Replace lost icons.
-
-Stripped
---------
-main.cpp
-karm.h
-karm.cpp
-task.h
-task.cpp
-toolicons.h
-
-Not yet
--------
-kaccelmenuwatch.h
-kaccelmenuwatch.cpp
-ktimewidget.h
-ktimewidget.cpp
-adddlg.h
-adddlg.cpp
-top.h
-top.cpp
 
 Dreams
 ------
@@ -65,9 +44,14 @@
 
 Pseudocode
 ----------
+    initialize
     parse command line
     parse titraq.conf file
+    load titraq.dat file
     show control window
+    wait for quit
+    save titraq.dat file
+    finish
 
 Test case
 ---------
@@ -80,7 +64,7 @@
     make install
 
     Assume:
-    OS has Qt 3.0.5 or newer multithreaded library
+    OS has Qt 3.0.6 or newer multithreaded library
 
     Begin:
     $ titraq

ossp-pkg/as/as-gui/as_gfx/ossplogo.xpm -> 1.1 

*** /dev/null    Sat Nov 23 01:37:31 2024
--- -    Sat Nov 23 01:38:01 2024
***************
*** 0 ****
--- 1,118 ----
+ /* XPM */
+ static char * ossplogo_xpm[] = {
+ "16 15 100 2",
+ "      c None",
+ ".     c #AAAAAA",
+ "+     c #909090",
+ "@     c #9B9B9B",
+ "#     c #C6C6C6",
+ "$     c #FEFEFE",
+ "%     c #FDFDFD",
+ "&     c #A2A2A2",
+ "*     c #888888",
+ "=     c #8A8A8A",
+ "-     c #FBFBFB",
+ ";     c #BFBFBF",
+ ">     c #D7D7D7",
+ ",     c #FFFFFF",
+ "'     c #EEEEEE",
+ ")     c #737373",
+ "!     c #FCFCFC",
+ "~     c #CCCCCC",
+ "{     c #C4C4C4",
+ "]     c #E2E2E2",
+ "^     c #E3E3E3",
+ "/     c #D5D5D5",
+ "(     c #4F4F4F",
+ "_     c #CFCFCF",
+ ":     c #646464",
+ "<     c #D2D2D2",
+ "[     c #434343",
+ "}     c #C2C2C2",
+ "|     c #DCDCDC",
+ "1     c #6E6E6E",
+ "2     c #AFAFAF",
+ "3     c #E0E0E0",
+ "4     c #F8F8F8",
+ "5     c #9F9F9F",
+ "6     c #EDEDED",
+ "7     c #949494",
+ "8     c #979797",
+ "9     c #919191",
+ "0     c #7F7F7F",
+ "a     c #7D7D7D",
+ "b     c #CDCDCD",
+ "c     c #999999",
+ "d     c #F4F4F4",
+ "e     c #EBEBEB",
+ "f     c #626262",
+ "g     c #E4E4E4",
+ "h     c #474747",
+ "i     c #C1C1C1",
+ "j     c #E7E7E7",
+ "k     c #C7C7C7",
+ "l     c #393939",
+ "m     c #F1F1F1",
+ "n     c #797979",
+ "o     c #DDDDDD",
+ "p     c #EFEFEF",
+ "q     c #D6D6D6",
+ "r     c #F3F3F3",
+ "s     c #4C4C4C",
+ "t     c #F9F9F9",
+ "u     c #F5F5F5",
+ "v     c #9C9C9C",
+ "w     c #FAFAFA",
+ "x     c #B8B8B8",
+ "y     c #D4D4D4",
+ "z     c #BDBDBD",
+ "A     c #A5A5A5",
+ "B     c #DBDBDB",
+ "C     c #F6F6F6",
+ "D     c #B6B6B6",
+ "E     c #D8D8D8",
+ "F     c #E5E5E5",
+ "G     c #D9D9D9",
+ "H     c #757575",
+ "I     c #BCBCBC",
+ "J     c #C9C9C9",
+ "K     c #CBCBCB",
+ "L     c #DFDFDF",
+ "M     c #934E4E",
+ "N     c #B68080",
+ "O     c #BCA4A4",
+ "P     c #A13B3B",
+ "Q     c #371A1A",
+ "R     c #777777",
+ "S     c #BAA5A5",
+ "T     c #A54343",
+ "U     c #BF4141",
+ "V     c #A74141",
+ "W     c #CA3333",
+ "X     c #3D0F0F",
+ "Y     c #B1B1B1",
+ "Z     c #B47474",
+ "`     c #C03939",
+ " .    c #CD3333",
+ "..    c #CC3333",
+ "+.    c #C5C5C5",
+ "@.    c #AC5050",
+ "#.    c #3B3B3B",
+ "$.    c #3C3C3C",
+ "%.    c #301212",
+ "&.    c #3C0F0F",
+ "      .       + @               ",
+ "  # $ % & *   = - % ;           ",
+ "> , , , '     ) ! ! ~ { ] ^ ^   ",
+ "  % $ / % ( _ , , / : < , , , [ ",
+ "  } |   1     2 3 4 5 6 , , , [ ",
+ "    7 8 9 0   a       < { b , [ ",
+ "  c d , e f   g h c ^ i } j k l ",
+ "    , , m n   - o d p q r , , s ",
+ "    t , , u v w , , w x y , , s ",
+ "    z A B     C D E F G ! , ! s ",
+ "      o H I J K b L } M N O P Q ",
+ "    R ! B % q G ! $ S T U V W X ",
+ "    R , , , g Y p % Z `  ... .X ",
+ "    R , , , +.r , , , @. .....X ",
+ "              #.$.$.$.%.&.&.&.  "};

ossp-pkg/as/as-gui/as_main.cpp 1.2 -> 1.3 

--- as_main.cpp  2002/10/21 16:52:22     1.2
+++ as_main.cpp  2002/11/08 12:21:34     1.3
@@ -1,15 +1,51 @@
 #include <qapplication.h>
-#include "version.h"
-#include "top.h"
+#include <qtable.h>
+#include <qimage.h>
+#include <qpixmap.h>
+#include <qstringlist.h>
 
-int main(int argc, char *argv[])
+#include "titraq.h"
+
+// OSSP logo: static const char *ossplogo_xpm[]
+#include "gfx/ossplogo.xpm"
+
+// Table size
+const int numRows = 10;
+const int numCols = 6;
+
+int main(int argc, char **argv)
 {
-    QApplication App(argc, argv);
+    QApplication App(argc, argv);                       
+
+    QTable table(numRows, numCols);
+
+    QHeader *header = table.horizontalHeader();
+    header->setLabel(0, QObject::tr("Klein"), 40);
+    header->setLabel(1, QObject::tr("Krasse Checkung"));
+    header->setLabel(5, QObject::tr("Combo Buxen"));
+    header->setMovingEnabled(TRUE);
+
+    QImage img(ossplogo_xpm);
+    QPixmap pix = img.scaleHeight(table.rowHeight(3));
+    table.setPixmap(3, 2, pix);
+    table.setText(3, 2, "OSSP");
+
+    QStringList comboEntries;
+    comboEntries << "uno" << "dos" << "tres" << "quatro";
 
-    KarmWindow *karm = new KarmWindow;
+    for (int i = 0; i < numRows; ++i){
+        QComboTableItem * item = new QComboTableItem(&table, comboEntries, FALSE);
+        item->setCurrentItem(i % 4);
+        table.setItem(i, 5, item);
+    }   
+    for (int j = 0; j < numRows; ++j)
+        table.setItem(j, 1, new QCheckTableItem(&table, "Checkung"));
 
-    App.setMainWidget(karm);
-    karm->show();
+//    Titraqform *pMainform = new Titraqform;
+//    App.setMainWidget(pMainform);
+//    pMainform->show();
 
+    App.setMainWidget(&table);
+    table.show();
     return App.exec();
 }

ossp-pkg/as/as-gui/configure.in 1.2 -> 1.3 

--- configure.in 2002/10/21 16:52:22     1.2
+++ configure.in 2002/11/08 12:21:34     1.3
@@ -51,7 +51,7 @@
 ACX_PTHREAD
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
-LIBS="$PTHREAD_CFLAGS $LIBS"
+LIBS="`echo $PTHREAD_CFLAGS | sed -e 's;.*\(-[[pmk]]thread[[s]]*\).*;\1;'` $LIBS"
 
 dnl Check other requirements
 AC_PROG_MAKE_SET
@@ -80,7 +80,8 @@
     LIBS="$LIBS -lX11 -lXext -lSM -lm"
 fi
 
-dnl Check typical FreeBSD resources
+dnl Check some X resources, typical of XFree86
+AC_CHECK_LIB(Xft, XftFreeTypeOpen, [LIBS="$LIBS -lXft"])
 AC_CHECK_LIB(Xrender, XRenderFindFormat, [LIBS="$LIBS -lXrender"])
 AC_CHECK_LIB(Xinerama, XineramaIsActive, [LIBS="$LIBS -lXinerama"])
 AC_CHECK_LIB(GL, glBegin, [LIBS="$LIBS -lGL"])

CVSTrac 2.0.1