Added a 'goto' button on the toolbar.

diff --git a/daphne/Makefile b/daphne/Makefile
index b31f82e5a1f04cb23bfca6c824a7e745e931c06a..93ec4561ca1a4b9a253ede29b26e1cfbae90645a 100644 (file)
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -12,11 +12,11 @@ all: daphne
 daphne: main.o citclient.o userlogin.o testwindow.o who.o \
        utils.o express_message.o send_express.o prefs.o \
        roomtree.o roomview.o message.o enter.o \
-       selectuser.o servprops.o
+       selectuser.o servprops.o 
        c++ main.o citclient.o userlogin.o testwindow.o who.o \
        utils.o express_message.o send_express.o prefs.o \
        roomtree.o roomview.o message.o enter.o \
-       selectuser.o servprops.o \
+       selectuser.o servprops.o\
        $(LFLAGS) -o daphne
 
 install: 

diff --git a/daphne/bitmaps/goto.bmp b/daphne/bitmaps/goto.bmp
new file mode 100644 (file)
index 0000000..855d2fa
Binary files /dev/null and b/daphne/bitmaps/goto.bmp differ

diff --git a/daphne/bitmaps/goto.xpm b/daphne/bitmaps/goto.xpm
new file mode 100644 (file)
index 0000000..dae4543
--- /dev/null
+++ b/daphne/bitmaps/goto.xpm
@@ -0,0 +1,93 @@
+/* XPM */
+static char * goto_xpm[] = {
+"32 32 58 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #939D95",
+"@     c #1A1A1A",
+"#     c #7D7F7E",
+"$     c #FFFFFD",
+"%     c #FEFEFF",
+"&     c #FFFEFF",
+"*     c #989898",
+"=     c #181818",
+"-     c #181A19",
+";     c #807E81",
+">     c #969B97",
+",     c #151918",
+"'     c #0001FE",
+")     c #171916",
+"!     c #808080",
+"~     c #FEFFFA",
+"{     c #999999",
+"]     c #181A17",
+"^     c #0000FD",
+"/     c #0201FF",
+"(     c #191A1C",
+"_     c #FEFEFC",
+":     c #9A9995",
+"<     c #191919",
+"[     c #0100FE",
+"}     c #0000FE",
+"|     c #1D191A",
+"1     c #7E7E80",
+"2     c #0101FF",
+"3     c #0200FE",
+"4     c #1B1B1B",
+"5     c #CBCBC9",
+"6     c #979996",
+"7     c #0001FC",
+"8     c #1B1A18",
+"9     c #7C7D7F",
+"0     c #CACFCB",
+"a     c #99999B",
+"b     c #161A19",
+"c     c #7F817E",
+"d     c #CECCCF",
+"e     c #989896",
+"f     c #161B15",
+"g     c #0000FB",
+"h     c #7E807F",
+"i     c #CCCECD",
+"j     c #FDFEFF",
+"k     c #9A989B",
+"l     c #19191B",
+"m     c #7C817D",
+"n     c #CCCCCC",
+"o     c #FEFFFF",
+"p     c #FEFEFE",
+"q     c #1A1917",
+"r     c #7F7F7F",
+"s     c #CCCBC9",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"............+@#$%$.&............",
+"............*=-;.&$.............",
+"............>,')!~.&............",
+"............{]^/(!._............",
+"............:<^[}|1.............",
+"............*-[23}45............",
+"............6]7'/890............",
+"............a@}7bcd$............",
+"............efg<hi$j............",
+"............k<lmnop.............",
+"............*qrs%&$o............",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................",
+"................................"};

diff --git a/daphne/includes.hpp b/daphne/includes.hpp
index 9ff1de0b4e99b78b5df62464dd5db8d226a67d24..93242a8313f1e54eb496f72e15b50c2e2439b98e 100644 (file)
--- a/daphne/includes.hpp
+++ b/daphne/includes.hpp
@@ -175,6 +175,21 @@ private:
        DECLARE_EVENT_TABLE()
 };
 
+// Just testing...
+class DoChat : public wxMDIChildFrame {
+public:
+        ChatWindow(CitClient *sock, wxMDIParentFrame *MyMDI);
+private:
+        wxPanel *panel;
+        wxTextCtrl *sendcmd;
+        wxTextCtrl *recvcmd;
+        wxTextCtrl *xfercmd;
+        wxButton *cmd_button;
+        wxButton *close_button;
+        void OnButtonPressed(wxCommandEvent& whichbutton);
+        CitClient *citsock;
+        DECLARE_EVENT_TABLE()
+};
 
 
 

diff --git a/daphne/main.cpp b/daphne/main.cpp
index cda3b7fb903b5d0e38147b117a83fed49b73a4c2..80b2beb1967619c543281e5da86b3e05e9557f2f 100644 (file)
--- a/daphne/main.cpp
+++ b/daphne/main.cpp
@@ -15,6 +15,7 @@
 #include "bitmaps/who.xpm"
 #include "bitmaps/chat.xpm"
 #include "bitmaps/xglobe.xpm"
+#include "bitmaps/goto.xpm"
 #endif
 
 
@@ -61,6 +62,7 @@ private:
        void OnEditMenu(wxCommandEvent& cmd);
        void OnUsersMenu(wxCommandEvent& cmd);
        void OnRoomsMenu(wxCommandEvent& cmd);
+/*     void OnDoChat(wxCommandEvent& event); */
         void MyFrame::OnSize(wxSizeEvent& event);
        wxButton *do_cmd;
        void InitToolBar(wxToolBar* toolBar);
@@ -102,6 +104,7 @@ enum
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(     MyFrame, wxMDIParentFrame)
+/*     EVT_MENU(       IG_Chat,                MyFrame::OnDoChat)*/
        EVT_MENU(       IG_Quit,                MyFrame::OnQuit)
        EVT_MENU(       IG_Term,                MyFrame::DoTerm)
        EVT_MENU(       IG_About,               MyFrame::OnAbout)
@@ -244,7 +247,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 // The toolbar for this application.
 void MyFrame::InitToolBar(wxToolBar* toolBar) {
        int i;
-       wxBitmap* bitmaps[5];
+       wxBitmap* bitmaps[6];
 
 // wxGTK seems to do the right thing by itself, while wxMSW wants to be
 // told how big the toolbar icons are going to be, otherwise it defaults to
@@ -261,12 +264,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
        bitmaps[2] = new wxBitmap("bitmaps/who.bmp",    wxBITMAP_TYPE_BMP);
        bitmaps[3] = new wxBitmap("bitmaps/chat.bmp",   wxBITMAP_TYPE_BMP);
        bitmaps[4] = new wxBitmap("bitmaps/xglobe.bmp", wxBITMAP_TYPE_BMP);
+       bitmaps[5] = new wxBitmap("bitmaps/goto.bmp",   wxBITMAP_TYPE_BMP);
 #else
        bitmaps[0] = new wxBitmap(globe_xpm);
        bitmaps[1] = new wxBitmap(mail_xpm);
        bitmaps[2] = new wxBitmap(who_xpm);
        bitmaps[3] = new wxBitmap(chat_xpm);
        bitmaps[4] = new wxBitmap(xglobe_xpm);
+       bitmaps[5] = new wxBitmap(goto_xpm);
 #endif
 
        toolBar->AddTool(MENU_CONNECT,
@@ -287,6 +292,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
                        (wxObject *)NULL,
                        "Open your e-mail inbox");
                        
+       toolBar->AddTool(RMENU_GOTO,
+                       *bitmaps[5],
+                       wxNullBitmap,
+                       FALSE,
+                       -1, -1,
+                       (wxObject *)NULL,
+                       "Goto next room");
+
        toolBar->AddSeparator();
 
        toolBar->AddTool(UMENU_WHO,
@@ -303,7 +316,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) {
                        FALSE,
                        -1, -1,
                        (wxObject *)NULL,
-                       "Real-time chat");
+                       "Real-time chat"); 
                        
         toolBar->AddTool(IG_Term,
                        *bitmaps[4],
@@ -338,6 +351,12 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
        cleanup(0);
 }
 
+/* // IG_Chat
+
+void MyFrame::OnDoChat(wxCommandEvent& unused) {
+       new ChatWindow(citadel, this);
+       sendcmd="CHAT";
+}*/
 
 // doterm(inate session)
 
@@ -453,6 +472,7 @@ void MyFrame::OnGotoMail(wxCommandEvent& unused) {
 
 void MyFrame::OnTestWin(wxCommandEvent& unused) {
        new TestWindow(citadel, this);
+/*     sendcmd="CHAT"; */
 }
 
 void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) )