Changeset 6d06a0b in Renga

Timestamp:

Jul 14, 2019, 8:23:57 AM (5 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

b8c4006

Parents:

0e349ea

git-author:

Adrien Destugues <pulkomandy@…> (14/07/2019 08:22:20)

git-committer:

Adrien Destugues <pulkomandy@…> (14/07/2019 08:23:57)

Message:

Rename to Renga

I heard "Jabber for Haiku" is not a great name and the protocol isn't
called Jabber anymore these days.

TODO: replace all logos as well.

Files:

• CMakeLists.txt (modified) (4 diffs)
• README.md (modified) (1 diff)
• Renga.png (moved) (moved from Jabber4Haiku.png )
• jabber/BlabberMainWindow.cpp (modified) (2 diffs)
• jabber/BlabberSettings.cpp (modified) (1 diff)
• jabber/JabberSpeak.cpp (modified) (1 diff)
• jabber/Resource.rdef (modified) (1 diff)
• jabber/TalkWindow.cpp (modified) (1 diff)
• jabber/TransportPreferencesView.cpp (modified) (1 diff)

CMakeLists.txt

@@ -2 +2 @@
 
 # projectname is the same as the main-executable
-project(Jabber)
+project(Renga)
 
 add_definitions('-g')
@@ -10 +10 @@
 include_directories(shared/split-pane)
 
-add_executable(Jabber
+add_executable(Renga
          jabber/Agent.cpp
          jabber/CommandMessage.cpp
@@ -57 +57 @@
 )
 
-target_link_libraries(Jabber
+target_link_libraries(Renga
         be expat game gloox tracker translation
 )
 
-add_custom_command(TARGET Jabber POST_BUILD 
+add_custom_command(TARGET Renga POST_BUILD 
         COMMAND rc -o Resource.rsrc ${CMAKE_SOURCE_DIR}/jabber/Resource.rdef
-        COMMAND xres -o ${CMAKE_BINARY_DIR}/Jabber Resource.rsrc
+        COMMAND xres -o ${CMAKE_BINARY_DIR}/Renga Resource.rsrc
                 -a PiNG:1:jabber-title ${CMAKE_SOURCE_DIR}/resources/graphics/jabber-title.png
                 -a PiNG:2:bulb-normal  ${CMAKE_SOURCE_DIR}/resources/graphics/bulb-normal.png
@@ -75 +75 @@
                 -a PiNG:10:yahoo       ${CMAKE_SOURCE_DIR}/resources/icons/yahoo.png
                 -a PiNG:11:msn         ${CMAKE_SOURCE_DIR}/resources/icons/msn.png
-        COMMAND mimeset -f ${CMAKE_BINARY_DIR}/Jabber
+        COMMAND mimeset -f ${CMAKE_BINARY_DIR}/Renga
         DEPENDS jabber/Resource.rdef
 )
 
-install(TARGETS Jabber RUNTIME DESTINATION apps/)
+install(TARGETS Renga RUNTIME DESTINATION apps/)

README.md

@@ -1 @@
-Jabber4Haiku is a free XMPP client for Haiku.
+Renga is a free XMPP client for Haiku.
 
-![Screenshot](Jabber4Haiku.png)
+![Screenshot](Renga.png)
 
 <hr></hr>

jabber/BlabberMainWindow.cpp

@@ -648 +648 @@
 
 BlabberMainWindow::BlabberMainWindow(BRect frame)
-        : BWindow(frame, "Jabber", B_DOCUMENT_WINDOW, 0) {
+        : BWindow(frame, "Renga", B_DOCUMENT_WINDOW, 0) {
 
         // editing filter for taksing
@@ -676 +676 @@
                 _disconnect_item->SetShortcut('B', 0);
 
-                _about_item      = new BMenuItem("About Jabber for Haiku", new BMessage(JAB_ABOUT));
+                _about_item      = new BMenuItem("About Renga" B_UTF8_ELLIPSIS, new BMessage(JAB_ABOUT));
 
                 _quit_item = new BMenuItem("Quit", new BMessage(JAB_QUIT));

jabber/BlabberSettings.cpp

@@ -35 +35 @@
         
         if (status == FileXMLReader::FILE_NOT_FOUND) {
-                // first time user perhaps?
-//              ModalAlertFactory::NonModalAlert("It appears that this is your first time using Jabber for Haiku.", "Your welcome!");
        SetDefaultTagsValue();
         } else if (status == FileXMLReader::FILE_CORRUPTED) {

jabber/JabberSpeak.cpp

@@ -881 +881 @@
         }
 
-        fClient->disco()->setVersion("Jabber4Haiku", APP_VERSION, strVersion);
+        fClient->disco()->setVersion("Renga", APP_VERSION, strVersion);
 }
 

jabber/Resource.rdef

@@ -12 +12 @@
         internal = 0,
 
-        short_info = "Jabber for Haiku",
+        short_info = "Renga",
         long_info = "XMPP Instant Messaging Client for Haiku."
 };

jabber/TalkWindow.cpp

@@ -213 +213 @@
         _help_menu = new BMenu("Help");
 
-                _jabber_org_item = new BMenuItem("Jabber.org", new BMessage(JAB_JABBER_ORG));
-                _riv_item = new BMenuItem("OsDrawer Web site", new BMessage(JAB_RIV));
-                _jabber_central_org_item = new BMenuItem("JabberCentral.org", new BMessage(JAB_JABBER_CENTRAL_ORG));
-                _jabber_view_com_item = new BMenuItem("JabberView.com", new BMessage(JAB_JABBER_VIEW_COM));
-                _user_guide_item = new BMenuItem("Jabber for Haiku Manual", new BMessage(JAB_USER_GUIDE));
-                _faq_item = new BMenuItem("Jabber for Haiku FAQ", new BMessage(JAB_FAQ));
-                BMessage* haiku_channel = new BMessage(JAB_A_CHANNEL);
-                haiku_channel->AddString("channel", "haiku-os@conference.jabber.org");
-                _beos_user_item = new BMenuItem("Haiku Users Directory", haiku_channel);
+                //_jabber_org_item = new BMenuItem("Jabber.org", new BMessage(JAB_JABBER_ORG));
+                //_riv_item = new BMenuItem("OsDrawer Web site", new BMessage(JAB_RIV));
+                //_jabber_central_org_item = new BMenuItem("JabberCentral.org", new BMessage(JAB_JABBER_CENTRAL_ORG));
+                //_jabber_view_com_item = new BMenuItem("JabberView.com", new BMessage(JAB_JABBER_VIEW_COM));
+                _user_guide_item = new BMenuItem("Renga Manual", new BMessage(JAB_USER_GUIDE));
+                _faq_item = new BMenuItem("Renga FAQ", new BMessage(JAB_FAQ));
+                //BMessage* haiku_channel = new BMessage(JAB_A_CHANNEL);
+                //haiku_channel->AddString("channel", "haiku-os@conference.jabber.org");
+                //_beos_user_item = new BMenuItem("Haiku Users Directory", haiku_channel);
 
         _help_menu->AddItem(_user_guide_item);
         _help_menu->AddItem(_faq_item);
-        _help_menu->AddItem(_beos_user_item);
-        _help_menu->AddSeparatorItem();
-        _help_menu->AddItem(_riv_item);
-        _help_menu->AddSeparatorItem();
-        _help_menu->AddItem(_jabber_org_item);
-        _help_menu->AddItem(_jabber_central_org_item);
-        _help_menu->AddItem(_jabber_view_com_item);
+        //_help_menu->AddItem(_beos_user_item);
+        //_help_menu->AddSeparatorItem();
+        //_help_menu->AddItem(_riv_item);
+        //_help_menu->AddSeparatorItem();
+        //_help_menu->AddItem(_jabber_org_item);
+        //_help_menu->AddItem(_jabber_central_org_item);
+        //_help_menu->AddItem(_jabber_view_com_item);
         _help_menu->SetTargetForItems(this);
 

jabber/TransportPreferencesView.cpp

@@ -171 +171 @@
         enter_note->MakeEditable(false);
         enter_note->MakeSelectable(false);
-        enter_note->SetText("Note: Transports serve as the means by which Jabber communicates with external chat systems such as AOL and ICQ.  They are add-on components to the Jabber server you are logged on to and thus can be ERRATIC and/or BUGGY.  If you are having trouble with a transport, it is likely the server's fault and not Jabber for Haiku.");
+        enter_note->SetText("Note: Transports serve as the means by which Jabber "
+                "communicates with external chat systems such as AOL and ICQ.  They "
+                "are add-on components to the Jabber server you are logged on to and "
+                "thus can be ERRATIC and/or BUGGY.  If you are having trouble with a "
+                "transport, it is likely the server's fault and not Renga.");
 
         _surrounding->AddChild(enter_note);