Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated project to Symbian^3 SDK 1.0
Fixed memory (drive) selection in settings, so that now all drives show up
correctly
  • Loading branch information
imrekel committed Oct 23, 2012
1 parent fd1f1d8 commit b777ce8
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 47 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -5,3 +5,4 @@ SymTorrent*.sisx
.metadata/
ABLD.BAT
devcert-ovi/
nvgencoder.log
2 changes: 1 addition & 1 deletion KiLogger/group/KiLogger.mmp
Expand Up @@ -10,7 +10,7 @@ UID 0x1000008d 0x2000CBEB

USERINCLUDE ..\inc
SYSTEMINCLUDE .
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include \epoc32\include\mw \epoc32\include\platform

SOURCEPATH ..\src

Expand Down
2 changes: 1 addition & 1 deletion SymTorrent/group/SymTorrent.mmp
Expand Up @@ -68,7 +68,7 @@ USERINCLUDE ..\..\KiLogger\inc

SYSTEMINCLUDE .
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\ecom
SYSTEMINCLUDE \epoc32\include\ecom \epoc32\include\mw \epoc32\include\platform \epoc32\include\platform\mw
// SYSTEMINCLUDE \epoc32\include\stdapis // !!!DHT!!!
// SYSTEMINCLUDE \epoc32\include\stdapis\glib-2.0 // !!!DHT!!!

Expand Down
18 changes: 9 additions & 9 deletions SymTorrent/group/Symtorrent_icons.mk
Expand Up @@ -31,15 +31,15 @@ LIB : do_nothing
CLEANLIB : do_nothing

RESOURCE :
mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) /c24,8\
..\gfx\downloading.svg \
..\gfx\complete.svg \
..\gfx\paused.svg \
..\gfx\failed.svg \
..\gfx\uploading.svg \
..\gfx\not_uploading.svg \
..\gfx\empty.svg \
..\gfx\not_sharing.svg
mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
/c24,8 ..\gfx\downloading.svg \
/c24,8 ..\gfx\paused.svg \
/c24,8 ..\gfx\failed.svg \
/c24,8 ..\gfx\uploading.svg \
/c24,8 ..\gfx\not_uploading.svg \
/c24,8 ..\gfx\empty.svg \
/c24,8 ..\gfx\not_sharing.svg \
/c24,8 ..\gfx\complete.svg

FREEZE : do_nothing

Expand Down
10 changes: 8 additions & 2 deletions SymTorrent/sis/SymTorrent.pkg
@@ -1,5 +1,5 @@
;/*****************************************************************************
; * Copyright (C) 2006-2007 Imre Kelnyi
; * Copyright (C) 2006-2007 Imre Kel?nyi
; *-------------------------------------------------------------------
; * This file is part of SymTorrent
; *
Expand All @@ -26,7 +26,7 @@
&EN

; The app's UID
#{"SymTorrent"},(0xA0001751),1,50,0
#{"SymTorrent"},(0xA0001751),1,51,0
%{"BUTE AAIT"}
:"BUTE AAIT"

Expand All @@ -36,6 +36,12 @@
;Supports S60 release 5.0
[0x1028315F], 0, 0, 0, {"Series60ProductID"}

;Supports Symbian^3 and Anna
[0x20022E6D], 0, 0, 0, {"Series60ProductID"}

;Supports Symbian Belle
[0x2003A678], 0, 0, 0, {"Series60ProductID"}

;
; Files to install
;
Expand Down
23 changes: 10 additions & 13 deletions SymTorrent/src/FileSelectionSettingItem.cpp
Expand Up @@ -23,7 +23,7 @@
#include <avkon.hrh>
#include <aknPopup.h>
#include <caknfileselectiondialog.h>
#include <caknmemoryselectiondialog.h>
#include <caknmemoryselectiondialogmultidrive.h>


CFileSelectionSettingItem::CFileSelectionSettingItem(TInt aIdentifier, TFileName& aFileName, TCommonDialogType aDialogType) :
Expand All @@ -44,33 +44,30 @@ const TDesC& CFileSelectionSettingItem::SettingTextL( )
}

void CFileSelectionSettingItem::EditItemL(TBool /*aCalledFromMenu*/)
{
// Select memory
CAknMemorySelectionDialog* memSelectionDialog = CAknMemorySelectionDialog::NewL
{
// Select drive
CAknMemorySelectionDialogMultiDrive* memSelectionDialog = CAknMemorySelectionDialogMultiDrive::NewL
(ECFDDialogTypeNormal, /*aShowUnavailableDrives*/EFalse);
CleanupStack::PushL(memSelectionDialog);

CAknMemorySelectionDialog::TMemory mem(CAknMemorySelectionDialog::EPhoneMemory);

TInt ret = memSelectionDialog->ExecuteL(mem);
TDriveNumber mem;
TFileName memRootPath;

TInt ret = memSelectionDialog->ExecuteL(mem, &iOwnedFileName, NULL);
CleanupStack::PopAndDestroy(memSelectionDialog);
if (!ret) return;

// Select file on the selected drive
CAknFileSelectionDialog* fileSelectionDialog =
CAknFileSelectionDialog::NewL(iDialogType);
CleanupStack::PushL(fileSelectionDialog);

fileSelectionDialog->SetTitleL(_L("Download files to"));
fileSelectionDialog->SetLeftSoftkeyFileL(_L("Select"));

if (mem == CAknMemorySelectionDialog::EMemoryCard)
iOwnedFileName = _L("E:\\");
else
iOwnedFileName = _L("C:\\");

// launch file select dialog
TBool result = fileSelectionDialog->ExecuteL(iOwnedFileName);
CleanupStack::PopAndDestroy(); // fileSelectionDialog
CleanupStack::PopAndDestroy(fileSelectionDialog);

if (result)
iFileName = iOwnedFileName;
Expand Down
3 changes: 1 addition & 2 deletions SymTorrent/src/SymTorrentProxySettingsContainer.cpp
Expand Up @@ -123,9 +123,8 @@ void CSymTorrentProxySettingsContainer::EditItemL(TInt aIndex, TBool aCalledFrom
(*SettingItemArray())[aIndex]->StoreL();

//TIncomingConnectionsMode incomingConnectionsMode =
// TIncomingConnectionsMode(iIncomingConnections);
// TIncomingConnectionsMode(iIncomingConnections);

CSTTorrentManager* torrentMgr = TORRENTMGR;
CSTPreferences* prefs = PREFERENCES;

switch (aIndex)
Expand Down
1 change: 0 additions & 1 deletion SymTorrent/src/SymTorrentSettingsContainer.cpp
Expand Up @@ -207,7 +207,6 @@ void CSymTorrentSettingsContainer::EditItemL(TInt aIndex, TBool aCalledFromMenu)
// TIncomingConnectionsMode incomingConnectionsMode =
// TIncomingConnectionsMode(iIncomingConnections);

CSTTorrentManager* torrentMgr = TORRENTMGR;
CSTPreferences* prefs = PREFERENCES;

switch (switchIndex)
Expand Down
2 changes: 1 addition & 1 deletion SymTorrentEngine/group/SymTorrentEngine.mmp
Expand Up @@ -46,7 +46,7 @@ USERINCLUDE ..\..\KiLogger\inc
// USERINCLUDE ..\..\..\KademliaCore\inc // !!!DHT!!!
// USERINCLUDE ..\..\..\BitTorrentDHT\inc // !!!DHT!!!
// SYSTEMINCLUDE .
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include \epoc32\include\mw \epoc32\include\platform \epoc32\include\platform\mw
SYSTEMINCLUDE \epoc32\include\ecom
// SYSTEMINCLUDE \epoc32\include\stdapis // !!!DHT!!!
// SYSTEMINCLUDE \epoc32\include\stdapis\glib-2.0 // !!!DHT!!!
Expand Down
8 changes: 4 additions & 4 deletions SymTorrentEngine/inc/engine/STDefs.h
@@ -1,5 +1,5 @@
/*****************************************************************************
* Copyright (C) 2006-2007 Imre Kelényi
* Copyright (C) 2006-2012 Imre Kelényi
*-------------------------------------------------------------------
* This file is part of SymTorrent
*
Expand All @@ -21,9 +21,9 @@
#ifndef __STDEFS_H__
#define __STDEFS_H__

#define SYMTORRENT_VERSION 1.50
#define SYMTORRENT_VERSION_LIT _L("1.50")
#define SYMTORRENT_PEER_ID_VERSION _L8("-ST0150-")
#define SYMTORRENT_VERSION 1.51
#define SYMTORRENT_VERSION_LIT _L("1.51")
#define SYMTORRENT_PEER_ID_VERSION _L8("-ST0151-")

#define SYMTORRENT_ENGINE_UID 0xA0001C44

Expand Down
2 changes: 1 addition & 1 deletion SymTorrentEngine/inc/engine/STPeerArray.h
Expand Up @@ -55,7 +55,7 @@ class RSTPeerArray

private:

CSTBencodedList* RSTPeerArray::CreatePeerInfoBencodeL(CSTPeer& aPeer);
CSTBencodedList* CreatePeerInfoBencodeL(CSTPeer& aPeer);

private:

Expand Down
2 changes: 1 addition & 1 deletion SymTorrentEngine/inc/engine/STTorrent.h
Expand Up @@ -172,7 +172,7 @@ class CSTTorrent : public CBase,
* Adds a push peer to the torrent's peer list.
* Push peers are connected by the engine even if no pieces are needed from them.
*/
IMPORT_C void CSTTorrent::AddPushPeerL(TInetAddr aAddress);
IMPORT_C void AddPushPeerL(TInetAddr aAddress);

/**
* Saves the sate of the torrent
Expand Down
5 changes: 1 addition & 4 deletions SymTorrentLaunch/group/SymTorrentLaunch.mmp
Expand Up @@ -30,11 +30,9 @@ START RESOURCE SymTorrentLaunch_reg.rss
TARGETPATH \private\10003a3f\import\apps
END



USERINCLUDE ..\inc

SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include \epoc32\include\mw \epoc32\include\platform \epoc32\include\platform\mw

LIBRARY euser.lib
LIBRARY apparc.lib
Expand All @@ -55,4 +53,3 @@ LANG SC
VENDORID 0
CAPABILITY NONE
// End of File

7 changes: 0 additions & 7 deletions SymTorrentLaunch/group/bld.inf
Expand Up @@ -8,13 +8,6 @@
============================================================================
*/

PRJ_PLATFORMS
WINSCW ARMV5 GCCE

PRJ_EXPORTS
//..\inc\hello.txt ..\release\winscw\udeb\z\system\apps\symtorrentlaunch\hello.txt
PRJ_MMPFILES

//gnumakefile icons_reg_scalable_dc.mk

SymTorrentLaunch.mmp

1 comment on commit b777ce8

@biancabrade
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cum aflu parola de mess a cuiva si cum descarc un keylogger gratuit?

Please sign in to comment.