Remove controls for paging through disks.

The plan is to allow loading more results into the list instead.
This commit is contained in:
Stephen Heumann 2019-04-16 14:35:07 -05:00
parent aea01b7721
commit 048f421af2
2 changed files with 5 additions and 113 deletions

View File

@ -42,12 +42,7 @@ char finderRequestName[] = "\pApple~Finder~";
#define forIIGSRadio 1005 #define forIIGSRadio 1005
#define forAnyAppleIIRadio 1006 #define forAnyAppleIIRadio 1006
#define disksList 1007 #define disksList 1007
#define previousPageButton 1008 #define mountDiskButton 1008
#define pageText 1009
#define pageNumberLine 1010
#define ofPagesText 1011
#define nextPageButton 1012
#define mountDiskButton 1013
#define searchErrorAlert 3000 #define searchErrorAlert 3000
@ -168,7 +163,7 @@ boolean DoLEEdit (int editAction) {
SetPort(window); SetPort(window);
ctl = FindTargetCtl(); ctl = FindTargetCtl();
id = GetCtlID(ctl); id = GetCtlID(ctl);
if ((id == searchLine) || (id == pageNumberLine)) { if (id == searchLine) {
LEFromScrap(); LEFromScrap();
switch (editAction) { switch (editAction) {
case cutAction: case cutAction:
@ -188,7 +183,7 @@ boolean DoLEEdit (int editAction) {
}; };
}; };
SetPort(port); SetPort(port);
return ((id == searchLine) || (id == pageNumberLine)); return (id == searchLine);
} }
boolean processDoc(json_value *docObj) { boolean processDoc(json_value *docObj) {
@ -356,12 +351,6 @@ void DoSearch(void) {
disksListHandle); disksListHandle);
HiliteCtlByID(noHilite, window, mountDiskButton); HiliteCtlByID(noHilite, window, mountDiskButton);
ShowControl(GetCtlHandleFromID(window, previousPageButton));
ShowControl(GetCtlHandleFromID(window, pageText));
ShowControl(GetCtlHandleFromID(window, pageNumberLine));
ShowControl(GetCtlHandleFromID(window, ofPagesText));
ShowControl(GetCtlHandleFromID(window, nextPageButton));
free(searchURL); free(searchURL);
EndTCPConnection(&sess); EndTCPConnection(&sess);
InitCursor(); InitCursor();
@ -392,14 +381,7 @@ void HandleEvent(int eventCode, WmTaskRec *taskRec) {
case forAnyAppleIIRadio: case forAnyAppleIIRadio:
gsDisksOnly = false; gsDisksOnly = false;
break; break;
case previousPageButton:
//TODO
break;
case nextPageButton:
//TODO
break;
case mountDiskButton: case mountDiskButton:
// TODO // TODO
break; break;
@ -513,12 +495,6 @@ void ShowBrowserWindow(void) {
HiliteCtlByID(inactiveHilite, window, disksList); HiliteCtlByID(inactiveHilite, window, disksList);
HiliteCtlByID(inactiveHilite, window, mountDiskButton); HiliteCtlByID(inactiveHilite, window, mountDiskButton);
HideControl(GetCtlHandleFromID(window, previousPageButton));
HideControl(GetCtlHandleFromID(window, pageText));
HideControl(GetCtlHandleFromID(window, pageNumberLine));
HideControl(GetCtlHandleFromID(window, ofPagesText));
HideControl(GetCtlHandleFromID(window, nextPageButton));
cleanup: cleanup:
if (resourceFileOpened && !windowOpened) { if (resourceFileOpened && !windowOpened) {

View File

@ -8,12 +8,7 @@
#define forIIGSRadio 1005 #define forIIGSRadio 1005
#define forAnyAppleIIRadio 1006 #define forAnyAppleIIRadio 1006
#define disksList 1007 #define disksList 1007
#define previousPageButton 1008 #define mountDiskButton 1008
#define pageText 1009
#define pageNumberLine 1010
#define ofPagesText 1011
#define nextPageButton 1012
#define mountDiskButton 1013
resource rWindParam1 (winDiskBrowser) { resource rWindParam1 (winDiskBrowser) {
fTitle+fClose+fFlex+fMove+fVis, /* wFrameBits */ fTitle+fClose+fFlex+fMove+fVis, /* wFrameBits */
@ -36,11 +31,6 @@ resource rWindParam1 (winDiskBrowser) {
resource rControlList (winDiskBrowser) {{ resource rControlList (winDiskBrowser) {{
mountDiskButton, mountDiskButton,
previousPageButton,
pageText,
pageNumberLine,
ofPagesText,
nextPageButton,
disksList, disksList,
findDisksForText, findDisksForText,
forIIGSRadio, forIIGSRadio,
@ -139,80 +129,6 @@ resource rControlTemplate (disksList) {
}}; }};
}; };
resource rControlTemplate (previousPageButton) {
previousPageButton,
{150, 10, 161, 34},
SimpleButtonControl {{
0,
$1000+RefIsResource,
0,
previousPageButton,
0, /* color table ref */
{"","",0,0} /* key equivalent */
}};
};
resource rPString(previousPageButton) { "<" };
resource rControlTemplate (pageText) {
pageText, /* control ID */
{151, 38, 163, 90}, /* control rect */
statTextControl {{
fBlastText, /* flags */
$1000+RefIsResource, /* moreFlags */
0, /* refCon */
pageText /* title ref */
}};
};
resource rTextForLETextBox2 (pageText) {
"Page"
};
resource rControlTemplate (pageNumberLine) {
pageNumberLine,
{149, 72, 162, 116},
editLineControl {{
0,
$7000+RefIsResource,
0,
4, /* max size */
pageNumberLine /* text ref */
}};
};
resource rPString (pageNumberLine) { "" };
resource rControlTemplate (ofPagesText) {
ofPagesText, /* control ID */
{151, 119, 163, 170}, /* control rect */
statTextControl {{
fBlastText, /* flags */
$1000+RefIsResource, /* moreFlags */
0, /* refCon */
ofPagesText /* title ref */
}};
};
resource rTextForLETextBox2 (ofPagesText) {
" "
};
resource rControlTemplate (nextPageButton) {
nextPageButton,
{150, 168, 161, 192},
SimpleButtonControl {{
0,
$1000+RefIsResource,
0,
nextPageButton,
0, /* color table ref */
{"","",0,0} /* key equivalent */
}};
};
resource rPString(nextPageButton) { ">" };
resource rControlTemplate (mountDiskButton) { resource rControlTemplate (mountDiskButton) {
mountDiskButton, mountDiskButton,
{152, 305, 0, 0}, {152, 305, 0, 0},