i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Forgot to update the Canna directory.

Browse Source 
* This fixes bug #3660.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29881 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-04-03 17:52:49 +00:00
parent e78f5dd383
commit 5544769e7d
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/methods/canna/CannaLooper.cpp
+27 -16
View File
@@ -10,15 +10,17 @@
#include <string.h> #include <string.h>
#include <Alert.h>
#include <FindDirectory.h>
#include <Input.h> #include <Input.h>
#include <Screen.h>
#include <Menu.h> #include <Menu.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <Alert.h>
#include <Messenger.h> #include <Messenger.h>
#include <Path.h>
#include <Screen.h>
#ifdef DEBUG #ifdef DEBUG
#include <Debug.h> # include <Debug.h>
#endif #endif
#include "CannaCommon.h" #include "CannaCommon.h"
@@ -27,8 +29,9 @@
#include "KouhoWindow.h" #include "KouhoWindow.h"
#include "PaletteWindow.h" #include "PaletteWindow.h"
CannaLooper::CannaLooper( CannaMethod *method )
:BLooper( "Canna Looper" ) CannaLooper::CannaLooper(CannaMethod* method)
: BLooper("Canna Looper")
{ {
owner = method; owner = method;
canna = 0; canna = 0;
@@ -109,23 +112,31 @@ CannaLooper::Quit()
BLooper::Quit(); BLooper::Quit();
} }
status_t status_t
CannaLooper::ReadSettings( char *basepath ) CannaLooper::ReadSettings(char* basePath)
{ {
#ifndef __HAIKU__ BPath path;
strcpy( basepath, "/boot/home/config/KanBe/" ); status_t status = find_directory(B_SYSTEM_DATA_DIRECTORY, &path);
#else if (status != B_OK)
strcpy( basepath, "/etc/KanBe/" ); return status;
#endif
path.Append("KanBe");
strcpy(basePath, path.Path());
font_family family; font_family family;
font_style style; font_style style;
strcpy( family, "Haru" ); strcpy(family, "Haru");
strcpy( style, "Regular" ); strcpy(style, "Regular");
kouhoFont.SetFamilyAndStyle( family, style );
kouhoFont.SetSize( 12 ); kouhoFont.SetFamilyAndStyle(family, style);
return B_NO_ERROR; kouhoFont.SetSize(12);
return B_OK;
} }
void void
CannaLooper::EnqueueMessage( BMessage *msg ) CannaLooper::EnqueueMessage( BMessage *msg )
{ {