jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Rename Caya to Cardie

This commit is contained in:
Jaidyn Ann 2021-06-22 01:06:00 -05:00
parent de28bc8673
commit de09ff9ad6
13 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,6 +1,6 @@
.DEFAULT_GOAL := default .DEFAULT_GOAL := default
caya: app:
$(MAKE) -f application/Makefile $(MAKE) -f application/Makefile
protocols: protocols:
@ -11,7 +11,7 @@ libs:
clean: clean:
$(MAKE) -f application/Makefile clean $(MAKE) -f application/Makefile clean
all: libs protocols caya all: libs protocols app
.PHONY: libs protocols .PHONY: libs protocols

8
README.md
View File

@ -1,4 +1,4 @@
# ![Icon](data/icons/Caya.png) Caya # Cardie
![GSoC 2021](https://img.shields.io/badge/GSoC-2021-green.svg) ![GSoC 2021](https://img.shields.io/badge/GSoC-2021-green.svg)
A multi-protocol chat program. A multi-protocol chat program.
@ -6,13 +6,13 @@ A multi-protocol chat program.
![Screenshot](data/screenshots/update-1.png) ![Screenshot](data/screenshots/update-1.png)
## Building ## Building
You can make Caya and its protocols with: You can make Cardie and its protocols with:
`$ make` `$ make`
Caya itself requires the `expat_devel` package, the XMPP protocol requires Cardie itself requires the `expat_devel` package, the XMPP protocol requires
`gloox_devel`, and the (provisional) IRC protocol requires `gloox_devel`, and the (provisional) IRC protocol requires
`libircclient_devel`. You can also build either independent of the other: `libircclient_devel`. You can also build either independent of the other:
`$ make caya; make libs; make protocols; make -f protocols/xmpp/Makefile` `$ make caya; make libs; make protocols`

3
application/Caya.h → application/Cardie.h
View File

@ -5,6 +5,7 @@
#ifndef _APP_H #ifndef _APP_H
#define _APP_H #define _APP_H
#define APP_SIGNATURE "application/x-vnd.caya.Caya" #define APP_SIGNATURE "application/x-vnd.cardie"
#define APP_NAME "Cardie"
#endif // _APP_H #endif // _APP_H

6
application/Caya.rdef → application/Cardie.rdef
View File

@ -1,4 +1,4 @@
#include "Caya.h" #include "Cardie.h"
resource app_signature APP_SIGNATURE; resource app_signature APP_SIGNATURE;
@ -10,8 +10,8 @@ resource app_version {
variety = B_APPV_ALPHA, variety = B_APPV_ALPHA,
internal = 0, internal = 0,
short_info = "Caya", short_info = APP_NAME,
long_info = "©2009-2015 Andrea Anzani, Pier Luigi Fiorini, Dario Casalinuovo" long_info = "©2009-2021 Andrea Anzani, Pier Luigi Fiorini, Dario Casalinuovo, Jaidyn Levesque"
}; };
resource app_flags B_SINGLE_LAUNCH; resource app_flags B_SINGLE_LAUNCH;

6
application/Makefile
View File

@ -8,7 +8,7 @@
## file:///system/develop/documentation/makefile-engine.html ## file:///system/develop/documentation/makefile-engine.html
# The name of the binary. # The name of the binary.
NAME = Caya NAME = Cardie
# The type of binary, must be one of: # The type of binary, must be one of:
# APP: Application # APP: Application
@ -18,7 +18,7 @@ NAME = Caya
TYPE = APP TYPE = APP
# If you plan to use localization, specify the application's MIME signature. # If you plan to use localization, specify the application's MIME signature.
APP_MIME_SIG = application/x-vnd.caya.Caya APP_MIME_SIG = application/x-vnd.cardie
# The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are # The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
# so that Pe and Eddie can fill them in for you. # so that Pe and Eddie can fill them in for you.
@ -87,7 +87,7 @@ SRCS = \
# Specify the resource definition files to use. Full or relative paths can be # Specify the resource definition files to use. Full or relative paths can be
# used. # used.
RDEFS = Caya.rdef \ RDEFS = Cardie.rdef \
data/icons/status/Away.rdef \ data/icons/status/Away.rdef \
data/icons/status/Busy.rdef \ data/icons/status/Busy.rdef \
data/icons/status/Offline.rdef \ data/icons/status/Offline.rdef \

7
application/Server.cpp
View File

@ -26,6 +26,7 @@
#include "Account.h" #include "Account.h"
#include "AccountManager.h" #include "AccountManager.h"
#include "AppMessages.h" #include "AppMessages.h"
#include "Cardie.h"
#include "ChatProtocol.h" #include "ChatProtocol.h"
#include "AppPreferences.h" #include "AppPreferences.h"
#include "ChatProtocolMessages.h" #include "ChatProtocolMessages.h"
@ -505,7 +506,7 @@ Server::ImMessage(BMessage* msg)
= ProtocolManager::Get()->ProtocolAddOn(protocol); = ProtocolManager::Get()->ProtocolAddOn(protocol);
BNotification notification(B_PROGRESS_NOTIFICATION); BNotification notification(B_PROGRESS_NOTIFICATION);
notification.SetGroup(BString("Caya")); notification.SetGroup(BString(APP_NAME));
notification.SetTitle(title); notification.SetTitle(title);
notification.SetIcon(addOn->ProtoIcon()); notification.SetIcon(addOn->ProtoIcon());
notification.SetContent(message); notification.SetContent(message);
@ -537,7 +538,7 @@ Server::ImMessage(BMessage* msg)
= ProtocolManager::Get()->ProtocolAddOn(protocol); = ProtocolManager::Get()->ProtocolAddOn(protocol);
BNotification notification((notification_type)type); BNotification notification((notification_type)type);
notification.SetGroup(BString("Caya")); notification.SetGroup(BString(APP_NAME));
notification.SetTitle(title); notification.SetTitle(title);
notification.SetIcon(addOn->ProtoIcon()); notification.SetIcon(addOn->ProtoIcon());
notification.SetContent(message); notification.SetContent(message);
@ -557,7 +558,7 @@ Server::ImMessage(BMessage* msg)
content.ReplaceAll("%user%", looper->Protocol()->GetName()); content.ReplaceAll("%user%", looper->Protocol()->GetName());
BNotification notification(B_INFORMATION_NOTIFICATION); BNotification notification(B_INFORMATION_NOTIFICATION);
notification.SetGroup(BString("Caya")); notification.SetGroup(BString(APP_NAME));
notification.SetTitle("Connected"); notification.SetTitle("Connected");
notification.SetContent(content); notification.SetContent(content);
notification.SetIcon(proto->Icon()); notification.SetIcon(proto->Icon());

10
application/TheApp.cpp
View File

@ -19,7 +19,7 @@
#include <librunview/Emoticor.h> #include <librunview/Emoticor.h>
#include "AboutWindow.h" #include "AboutWindow.h"
#include "Caya.h" #include "Cardie.h"
#include "AppMessages.h" #include "AppMessages.h"
#include "FilePanel.h" #include "FilePanel.h"
#include "MainWindow.h" #include "MainWindow.h"
@ -93,6 +93,7 @@ TheApp::AboutRequested()
"2009-2010 Andrea Anzani", "2009-2010 Andrea Anzani",
"2010-2015 Dario Casalinuovo", "2010-2015 Dario Casalinuovo",
"2009-2010 Pier Luigi Fiorini", "2009-2010 Pier Luigi Fiorini",
"2021 Jaidyn Levesque",
NULL NULL
}; };
@ -105,11 +106,12 @@ TheApp::AboutRequested()
}; };
BString extraInfo; BString extraInfo;
extraInfo << "Caya is released under the GNU GPL License." << "\n"; extraInfo << "%app% is released under the GNU GPL License." << "\n";
extraInfo << "Some parts of Caya are available under MIT license." << "\n"; extraInfo << "Some parts of %app% are available under MIT license." << "\n";
extraInfo << "Built: " << BUILD_DATE; extraInfo << "Built: " << BUILD_DATE;
extraInfo.ReplaceAll("%app%", APP_NAME);
AboutWindow* about = new AboutWindow("Caya", holders, AboutWindow* about = new AboutWindow(APP_NAME, holders,
authors, extraInfo.String()); authors, extraInfo.String());
about->Show(); about->Show();
delete about; delete about;

5
application/Utils.cpp
View File

@ -18,6 +18,7 @@
#include <kernel/fs_attr.h> #include <kernel/fs_attr.h>
#include "Cardie.h"
#include "Utils.h" #include "Utils.h"
@ -117,7 +118,7 @@ AccountsPath()
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK) if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
return NULL; return NULL;
path.Append("Caya/Protocols"); path.Append(APP_NAME "/Protocols");
if (create_directory(path.Path(), 0755) != B_OK) if (create_directory(path.Path(), 0755) != B_OK)
return NULL; return NULL;
@ -166,7 +167,7 @@ CachePath()
BPath path; BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK) if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
return NULL; return NULL;
path.Append("Caya/Cache"); path.Append(APP_NAME "/Cache");
if (create_directory(path.Path(), 0755) != B_OK) if (create_directory(path.Path(), 0755) != B_OK)
return NULL; return NULL;
return path.Path(); return path.Path();

3
application/preferences/AppPreferences.cpp
View File

@ -3,11 +3,12 @@
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#include "AppPreferences.h" #include "AppPreferences.h"
#include "Cardie.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
template<> const char* AppPreferences::fFolder = "Caya"; template<> const char* AppPreferences::fFolder = APP_NAME;
template<> const char* AppPreferences::fFilename = "preferences"; template<> const char* AppPreferences::fFilename = "preferences";
/* TODO update _Add* methods to /* TODO update _Add* methods to

3
application/views/ConversationView.cpp
View File

@ -21,6 +21,7 @@
#include "AppMessages.h" #include "AppMessages.h"
#include "AppPreferences.h" #include "AppPreferences.h"
#include "Cardie.h"
#include "ChatProtocolMessages.h" #include "ChatProtocolMessages.h"
#include "RenderView.h" #include "RenderView.h"
#include "Conversation.h" #include "Conversation.h"
@ -138,7 +139,7 @@ ConversationView::ImMessage(BMessage* msg)
notify_message << sender->GetName(); notify_message << sender->GetName();
BNotification notification(B_INFORMATION_NOTIFICATION); BNotification notification(B_INFORMATION_NOTIFICATION);
notification.SetGroup(BString("Caya")); notification.SetGroup(BString(APP_NAME));
notification.SetTitle(BString("New message")); notification.SetTitle(BString("New message"));
notification.SetIcon(sender->AvatarBitmap()); notification.SetIcon(sender->AvatarBitmap());
notification.SetContent(notify_message); notification.SetContent(notify_message);

2
application/views/ReplicantStatusView.cpp
View File

@ -27,7 +27,7 @@
#include <libinterface/BitmapView.h> #include <libinterface/BitmapView.h>
#include "AccountManager.h" #include "AccountManager.h"
#include "Caya.h" #include "Cardie.h"
#include "AppMessages.h" #include "AppMessages.h"
#include "AppPreferences.h" #include "AppPreferences.h"
#include "ChatProtocolMessages.h" #include "ChatProtocolMessages.h"

3
application/views/RosterView.cpp
View File

@ -18,6 +18,7 @@
#include "AppMessages.h" #include "AppMessages.h"
#include "AppPreferences.h" #include "AppPreferences.h"
#include "Cardie.h"
#include "ChatProtocolMessages.h" #include "ChatProtocolMessages.h"
#include "RosterItem.h" #include "RosterItem.h"
#include "RosterListView.h" #include "RosterListView.h"
@ -149,7 +150,7 @@ RosterView::ImMessage(BMessage* msg)
message << " is offline!"; message << " is offline!";
BNotification notification(B_INFORMATION_NOTIFICATION); BNotification notification(B_INFORMATION_NOTIFICATION);
notification.SetGroup(BString("Caya")); notification.SetGroup(BString(APP_NAME));
notification.SetTitle(BString("Presence")); notification.SetTitle(BString("Presence"));
notification.SetIcon(rosterItem->Bitmap()); notification.SetIcon(rosterItem->Bitmap());
notification.SetContent(message); notification.SetContent(message);

7
application/windows/MainWindow.cpp
View File

@ -20,6 +20,7 @@
#include "AccountManager.h" #include "AccountManager.h"
#include "AppMessages.h" #include "AppMessages.h"
#include "AppPreferences.h" #include "AppPreferences.h"
#include "Cardie.h"
#include "ChatProtocolMessages.h" #include "ChatProtocolMessages.h"
#include "ConversationItem.h" #include "ConversationItem.h"
#include "ConversationListView.h" #include "ConversationListView.h"
@ -42,7 +43,7 @@ const uint32 kLogin = 'LOGI';
MainWindow::MainWindow() MainWindow::MainWindow()
: :
BWindow(BRect(0, 0, 600, 400), "Caya", B_TITLED_WINDOW, 0), BWindow(BRect(0, 0, 600, 400), APP_NAME, B_TITLED_WINDOW, 0),
fWorkspaceChanged(false), fWorkspaceChanged(false),
fConversation(NULL), fConversation(NULL),
fRosterWindow(NULL), fRosterWindow(NULL),
@ -353,11 +354,11 @@ MainWindow::SetConversation(Conversation* chat)
fConversation = chat; fConversation = chat;
BString title(chat->GetName()); BString title(chat->GetName());
title << " ― Caya"; title << " ― " << APP_NAME;
SetTitle(title.String()); SetTitle(title.String());
} }
else else
SetTitle("Caya"); SetTitle(APP_NAME);
fRightView->AddChild(fChatView, 9); fRightView->AddChild(fChatView, 9);
fRightView->AddChild(fSendScroll, 1); fRightView->AddChild(fSendScroll, 1);