diff --git a/src/obdeddi/document.cpp b/src/obdeddi/document.cpp index 7545c68..8197604 100644 --- a/src/obdeddi/document.cpp +++ b/src/obdeddi/document.cpp @@ -88,13 +88,13 @@ void Document::set_player(size_t id,const PlayerValues& v){ uint32_t skills=0;for(int i=0;i<7;++i)skills|=uint32_t(v.skills[i])<<(i*2); p.w368=(p.w368&0x07ffc000u)|skills|uint32_t(v.nation&31)<<27; next.raw_player_bonus_values.at(id)=uint8_t(v.bonus|((v.nation>>5)<<7)); - if(encode_database(next)!=encode_database(db_)){db_=std::move(next);dirty_=true;changes_.push_back("record:"+std::to_string(id));} + if(encode_database(next)!=encode_database(db_)){db_=std::move(next);dirty_=true;changes_.push_back("player:"+std::to_string(id));} } void Document::set_club(size_t id,std::string name,int kit,int start,int length){ if(kit<0||kit>255||start<0||start>15||length<1||length>16||size_t(start+length)>name.size())throw FormatError("Ungueltige Farbe oder Kurznamens-Auswahl."); auto next=db_;rename(next.pools[0],next.raw_club_name_offsets,id,name);next.club_names.at(id)=std::move(name);next.raw_club_kit_selectors.at(id)=uint8_t(kit); if(id=int(profile_.counts.league_teams)||source==destination)throw FormatError("Kaderwechsel nur zwischen zwei Ligavereinen moeglich."); diff --git a/src/obdeddi/main_win32.cpp b/src/obdeddi/main_win32.cpp index 4ad51ce..b4ed133 100644 --- a/src/obdeddi/main_win32.cpp +++ b/src/obdeddi/main_win32.cpp @@ -13,6 +13,9 @@ #include #include #include +#ifdef _MSC_VER +#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") +#endif using bmh::obdeddi::Document; namespace { HWND window,list,tab,search,filter,panel,status,saveButton,target,swapBox; @@ -30,7 +33,7 @@ void error(const std::exception& e){MessageBoxW(window,wide(e.what()).c_str(),L" HWND control(const wchar_t* cls,const wchar_t* caption,DWORD style,int id,int x,int y,int w,int h,HWND parent){HWND c=CreateWindowExW(cls==std::wstring(L"EDIT")?WS_EX_CLIENTEDGE:0,cls,caption,WS_CHILD|WS_VISIBLE|style,px(x),px(y),px(w),px(h),parent,reinterpret_cast(INT_PTR(id)),GetModuleHandleW(nullptr),nullptr);SendMessageW(c,WM_SETFONT,reinterpret_cast(font),TRUE);return c;} int combo(HWND h){return int(SendMessageW(h,CB_GETCURSEL,0,0));} void add(HWND h,const std::wstring& s){SendMessageW(h,CB_ADDSTRING,0,reinterpret_cast(s.c_str()));} -int number(HWND h){auto value=text(h);size_t used=0;int n=std::stoi(value,&used);if(used!=value.size())throw std::runtime_error("Bitte eine ganze Zahl eingeben.");return n;} +int number(HWND h){try{auto value=text(h);size_t used=0;int n=std::stoi(value,&used);if(used!=value.size())throw std::invalid_argument("number");return n;}catch(...){throw std::runtime_error("Bitte eine ganze Zahl im angegebenen Bereich eingeben.");}} void caption(){SetWindowTextW(window,document&&document->dirty()?L"obdeddi *":L"obdeddi");EnableWindow(saveButton,document!=nullptr);} void setStatus(const std::wstring& value){SetWindowTextW(status,value.c_str());} std::wstring clubName(int id){return id<0?L"Pool / Reserve":original(document->database().club_names.at(size_t(id)));} @@ -52,7 +55,7 @@ void buildForm(){updating=true;formDirty=false;selected=selected<0?-1:selected;f control(L"STATIC",L"Zielverein",0,0,8,555,115,24,panel);target=control(L"COMBOBOX",L"",CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP,Target,138,550,228,240,panel);for(int t=0;tprofile().counts.league_teams);++t)add(target,clubName(t));SendMessageW(target,CB_SETCURSEL,0,0); control(L"STATIC",L"Tauschpartner",0,0,8,588,125,24,panel);swapBox=control(L"COMBOBOX",L"",CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP,Swap,138,584,228,240,panel);setSwapOptions();control(L"BUTTON",L"Kaderwechsel",WS_TABSTOP,Move,8,621,358,28,panel);bool assigned=document->club_of(size_t(selected))>=0;EnableWindow(target,assigned);EnableWindow(swapBox,assigned);EnableWindow(GetDlgItem(panel,Move),assigned); }else{auto id=size_t(selected);formField(L"Vereinsname",0,original(db.club_names[id]));formField(L"Trikot-Farbset",1,L"",true);for(int i=0;i<256;++i){if(std::find(db.raw_club_kit_selectors.begin(),db.raw_club_kit_selectors.end(),uint8_t(i))==db.raw_club_kit_selectors.end())continue;int row=int(SendMessageW(fields[1],CB_ADDSTRING,0,reinterpret_cast((L"Farbset "+std::to_wstring(i)).c_str())));SendMessageW(fields[1],CB_SETITEMDATA,WPARAM(row),i);if(db.raw_club_kit_selectors[id]==i)SendMessageW(fields[1],CB_SETCURSEL,WPARAM(row),0);} - auto span=id>4));formField(L"Kurzname Länge",3,std::to_wstring((span&15)+1));if(id>=db.raw_club_short_name_offsets.size()){EnableWindow(fields[2],FALSE);EnableWindow(fields[3],FALSE);} + auto span=id>4));formField(L"Länge (1–16)",3,std::to_wstring((span&15)+1));if(id>=db.raw_club_short_name_offsets.size()){EnableWindow(fields[2],FALSE);EnableWindow(fields[3],FALSE);} control(L"STATIC",L"Liga und Datensatzanzahlen bleiben fest. Wappen und andere Assets werden nicht bearbeitet.",0,0,8,130,358,60,panel);control(L"BUTTON",L"Werte übernehmen",WS_TABSTOP,Apply,8,205,358,28,panel); } RECT r;GetClientRect(panel,&r);SCROLLINFO si{sizeof(si),SIF_RANGE|SIF_PAGE|SIF_POS,0,px(mode==0?670:250),UINT(r.bottom),0,0};SetScrollInfo(panel,SB_VERT,&si,TRUE);updating=false; @@ -70,7 +73,7 @@ bool mayClose(){if(!apply())return false;if(!document||!document->dirty())return void load(const std::filesystem::path& path){try{auto next=std::make_unique(path);document=std::move(next);selected=-1;updating=true;SendMessageW(filter,CB_RESETCONTENT,0,0);add(filter,L"Alle Vereine");add(filter,L"Pool / Reserve");for(int t=0;tprofile().counts.league_teams);++t)add(filter,clubName(t));SendMessageW(filter,CB_SETCURSEL,0,0);updating=false;rebuild();caption();}catch(const std::exception&e){error(e);}} void open(){if(!mayClose())return;wchar_t path[32768]{};OPENFILENAMEW ofn{sizeof(ofn)};ofn.hwndOwner=window;ofn.lpstrFilter=L"OpenBMH-Daten (*.obd)\0*.obd\0Alle Dateien\0*.*\0";ofn.lpstrFile=path;ofn.nMaxFile=32768;ofn.Flags=OFN_FILEMUSTEXIST|OFN_PATHMUSTEXIST|OFN_NOCHANGEDIR;if(GetOpenFileNameW(&ofn))load(path);} LRESULT CALLBACK formProc(HWND h,UINT m,WPARAM w,LPARAM l){if(m==WM_SIZE){SCROLLINFO si{sizeof(si),SIF_PAGE};si.nPage=UINT(HIWORD(l));SetScrollInfo(h,SB_VERT,&si,TRUE);int next=GetScrollPos(h,SB_VERT);ScrollWindowEx(h,0,scrollPos-next,nullptr,nullptr,nullptr,nullptr,SW_SCROLLCHILDREN|SW_INVALIDATE|SW_ERASE);scrollPos=next;return 0;}if(m==WM_COMMAND)return SendMessageW(window,m,w,l);if(m==WM_VSCROLL||m==WM_MOUSEWHEEL){SCROLLINFO si{sizeof(si),SIF_ALL};GetScrollInfo(h,SB_VERT,&si);int next=scrollPos;if(m==WM_MOUSEWHEEL)next-=GET_WHEEL_DELTA_WPARAM(w)/WHEEL_DELTA*px(60);else switch(LOWORD(w)){case SB_LINEUP:next-=px(27);break;case SB_LINEDOWN:next+=px(27);break;case SB_PAGEUP:next-=int(si.nPage);break;case SB_PAGEDOWN:next+=int(si.nPage);break;case SB_THUMBTRACK:next=si.nTrackPos;break;};next=std::clamp(next,0,std::max(0,si.nMax-int(si.nPage)+1));ScrollWindowEx(h,0,scrollPos-next,nullptr,nullptr,nullptr,nullptr,SW_SCROLLCHILDREN|SW_INVALIDATE|SW_ERASE);scrollPos=next;SetScrollPos(h,SB_VERT,next,TRUE);return 0;}return DefWindowProcW(h,m,w,l);} -LRESULT CALLBACK proc(HWND h,UINT m,WPARAM w,LPARAM l){switch(m){case WM_SIZE:{RECT r;GetClientRect(h,&r);int right=std::max(px(420),r.right-px(400));MoveWindow(list,px(12),px(92),right-px(24),r.bottom-px(132),TRUE);MoveWindow(panel,right,px(92),r.right-right-px(12),r.bottom-px(132),TRUE);MoveWindow(status,px(12),r.bottom-px(30),r.right-px(24),px(24),TRUE);return 0;} +LRESULT CALLBACK proc(HWND h,UINT m,WPARAM w,LPARAM l){switch(m){case WM_SIZE:{RECT r;GetClientRect(h,&r);int right=std::max(px(420),int(r.right)-px(400));MoveWindow(list,px(12),px(92),right-px(24),r.bottom-px(132),TRUE);MoveWindow(panel,right,px(92),r.right-right-px(12),r.bottom-px(132),TRUE);MoveWindow(status,px(12),r.bottom-px(30),r.right-px(24),px(24),TRUE);return 0;} case WM_GETMINMAXINFO:{auto p=reinterpret_cast(l);p->ptMinTrackSize={px(940),px(630)};return 0;} case WM_COMMAND:{int id=LOWORD(w),code=HIWORD(w);if(updating)return 0;if(id==Open){open();return 0;}if(id==Save){save();return 0;}if(id==Apply){if(apply())buildForm();return 0;}if(id==Search&&code==EN_CHANGE){SetTimer(h,1,180,nullptr);return 0;}if(id==Filter&&code==CBN_SELCHANGE){if(apply())rebuild();return 0;}if(id==Target&&code==CBN_SELCHANGE){setSwapOptions();return 0;}if(id==Move){if(!apply())return 0;try{int partner=int(SendMessageW(swapBox,CB_GETITEMDATA,WPARAM(combo(swapBox)),0));document->move_player(size_t(selected),combo(target),partner);caption();rebuild();}catch(const std::exception&e){error(e);}return 0;}if(id>=200&&id<220&&(code==EN_CHANGE||code==CBN_SELCHANGE))formDirty=true;return 0;} case WM_TIMER:KillTimer(h,1);if(apply())rebuild();return 0;